diff --git a/bin/generate-docs.js b/bin/generate-docs.js
index b9afc6b61..e04b03d74 100644
--- a/bin/generate-docs.js
+++ b/bin/generate-docs.js
@@ -71,16 +71,28 @@ async function createDocsForService(yamlFilePath) {
 
         resources.push({ name: resourceName, type: methodType, identifiers: identifiers, schemaName, schema, componentsSchemas, resourceData, schemaTypeName });
     }
-	
+
+    // Build map of _list_only resources to their base resources
+    const listOnlyMap = {};
+    for (const resource of resources) {
+        if (resource.name.endsWith('_list_only')) {
+            const baseName = resource.name.replace('_list_only', '');
+            listOnlyMap[baseName] = resource;
+        }
+    }
+
+    // Filter out _list_only resources - they will be collapsed into base resource docs
+    const filteredResources = resources.filter(r => !r.name.endsWith('_list_only'));
+
     // Create index.md for the service
     const serviceIndexPath = path.join(serviceFolder, 'index.md');
-    const serviceIndexContent = await createServiceIndexContent(serviceName, resources);
+    const serviceIndexContent = await createServiceIndexContent(serviceName, filteredResources);
     fs.writeFileSync(serviceIndexPath, serviceIndexContent);
 
     // Divide resources into two columns
-    const halfLength = Math.ceil(resources.length / 2);
-    const firstColumn = resources.slice(0, halfLength);
-    const secondColumn = resources.slice(halfLength);
+    const halfLength = Math.ceil(filteredResources.length / 2);
+    const firstColumn = filteredResources.slice(0, halfLength);
+    const secondColumn = filteredResources.slice(halfLength);
 
     // Create resource subfolders and index.md for each resource
     firstColumn.forEach((resource) => {
@@ -90,7 +102,7 @@ async function createDocsForService(yamlFilePath) {
         }
 
         const resourceIndexPath = path.join(resourceFolder, 'index.md');
-        const resourceIndexContent = createResourceIndexContent(serviceName, resource.name, resource.type, resource.identifiers, resource.schemaName, resource.schema, resource.componentsSchemas, resource.resourceData, resource.schemaTypeName);
+        const resourceIndexContent = createResourceIndexContent(serviceName, resource.name, resource.type, resource.identifiers, resource.schemaName, resource.schema, resource.componentsSchemas, resource.resourceData, resource.schemaTypeName, listOnlyMap[resource.name]);
         fs.writeFileSync(resourceIndexPath, resourceIndexContent);
     });
 
@@ -101,7 +113,7 @@ async function createDocsForService(yamlFilePath) {
         }
 
         const resourceIndexPath = path.join(resourceFolder, 'index.md');
-        const resourceIndexContent = createResourceIndexContent(serviceName, resource.name, resource.type, resource.identifiers, resource.schemaName, resource.schema, resource.componentsSchemas, resource.resourceData, resource.schemaTypeName);
+        const resourceIndexContent = createResourceIndexContent(serviceName, resource.name, resource.type, resource.identifiers, resource.schemaName, resource.schema, resource.componentsSchemas, resource.resourceData, resource.schemaTypeName, listOnlyMap[resource.name]);
 
         try {
             fs.writeFileSync(resourceIndexPath, resourceIndexContent);
@@ -201,6 +213,39 @@ ${codeBlockEnd}
 `;
 }
 
+function createUpdateExample(serviceName, resourceName, resourceData, thisSchema, allSchemas) {
+    const updateOperation = resourceData.methods?.update_resource;
+    if (!updateOperation) {
+        return '';
+    }
+
+    const readOnlyProps = (thisSchema['x-read-only-properties'] || []).map(p => p.split('/')[0]);
+    const createOnlyProps = (thisSchema['x-create-only-properties'] || []).map(p => p.split('/')[0]);
+    const excludeProps = new Set([...readOnlyProps, ...createOnlyProps]);
+
+    const updatableProps = Object.keys(thisSchema.properties || {}).filter(p => !excludeProps.has(p));
+
+    if (updatableProps.length === 0) {
+        return '';
+    }
+
+    const patchFields = updatableProps.map(p => `    "${p}": ${toSnakeCase(fixCamelCaseIssues(p))}`).join(',\n');
+    const identifierValues = (resourceData['x-identifiers'] || []).map(id => `<${id}>`).join('|');
+
+    return `\n## ${mdCodeAnchor}UPDATE${mdCodeAnchor} example
+
+${sqlCodeBlockStart}
+/*+ update */
+UPDATE ${providerName}.${serviceName}.${resourceName}
+SET data__PatchDocument = string('{{ {
+${patchFields}
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '${identifierValues}';
+${codeBlockEnd}
+`;
+}
+
 function createInsertExample(serviceName, resourceName, resourceData, thisSchema, allSchemas) {
     const createOperation = resourceData.methods?.create_resource;
     if (!createOperation) {
@@ -378,7 +423,7 @@ ${codeBlockEnd}
 </Tabs>`;
 }
 
-function createResourceIndexContent(serviceName, resourceName, resourceType, resourceIdentifiers, schemaName, schema, componentsSchemas, resourceData, schemaTypeName) {
+function createResourceIndexContent(serviceName, resourceName, resourceType, resourceIdentifiers, schemaName, schema, componentsSchemas, resourceData, schemaTypeName, listOnlyResource) {
     // Create the markdown content for each resource index
     // resourceType is x-type, one of 'cloud_control' (cloud control), 'native' (native resource), 'view' (SQL view)
 
@@ -394,6 +439,7 @@ function createResourceIndexContent(serviceName, resourceName, resourceType, res
     let sqlVerbsList = [];
 
     const singularResourceName = pluralize.singular(resourceName);
+    const listOnlyResourceName = listOnlyResource ? listOnlyResource.name : null;
 
     const moreInfoCaption = `For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-${serviceName}-${singularResourceName.replace(/_/g, '')}.html"><code>${schemaTypeName}</code></a>.`;
 
@@ -622,6 +668,41 @@ function createResourceIndexContent(serviceName, resourceName, resourceType, res
     const sqlExampleGetCols = getColumns(schema.properties, false, resourceType === 'native', false);
     const sqlExampleGetTagsCols = getColumns(schema.properties, false, resourceType === 'native', true);
 
+    // Compute list_only fields for tabbed display
+    const listOnlyFields = listOnlyResource
+        ? generateSchemaJsonForResource(serviceName, listOnlyResourceName, 'cloud_control_view', schema, componentsSchemas, sqlExampleListCols)
+        : null;
+    const listOnlyFrom = listOnlyResourceName
+        ? `FROM ${providerName}.${serviceName}.${listOnlyResourceName}`
+        : null;
+
+    // Build the Fields section
+    let fieldsSection;
+    if (!(isSelectable || hasList || hasGet)) {
+        fieldsSection = '<code>SELECT</code> operation not supported for this resource.';
+    } else if (listOnlyResource && hasGet) {
+        const getFields = JSON.stringify(generateSchemaJsonForResource(serviceName, resourceName, resourceType, schema, componentsSchemas, sqlExampleListCols), null, 2);
+        const listFields = JSON.stringify(listOnlyFields, null, 2);
+        fieldsSection = `<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={${getFields}} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={${listFields}} />
+</TabItem>
+</Tabs>`;
+    } else {
+        fieldsSection = `<SchemaTable fields={${JSON.stringify(generateSchemaJsonForResource(serviceName, resourceName, resourceType, schema, componentsSchemas, sqlExampleListCols), null, 2)}} />`;
+    }
+
     return `---
 title: ${resourceName}
 hide_title: false
@@ -657,13 +738,14 @@ ${schema.description ? `<tr><td><b>Description</b></td><td>${cleanDescription(sc
 </table>
 
 ## Fields
-${isSelectable || hasList || hasGet ? `<SchemaTable fields={${JSON.stringify(generateSchemaJsonForResource(serviceName, resourceName, resourceType, schema, componentsSchemas, sqlExampleListCols), null, 2)}} />` : '<code>SELECT</code> operation not supported for this resource.'}
+${fieldsSection}
 ${schemaName && resourceType === 'cloud_control' ? `\n${moreInfoCaption}\n` : ''}
 ## Methods
-${generateMethodsTable(serviceName, resourceName, sqlVerbsList)}
+${generateMethodsTable(serviceName, resourceName, sqlVerbsList, listOnlyResourceName)}
 
-${serviceName != 'cloud_control' ? generateSelectExamples(resourceName, hasList, hasGet, sqlExampleSelect, sqlExampleListCols, sqlExampleFrom, sqlExampleListWhere, sqlExampleGetCols, sqlExampleGetTagsCols, sqlExampleGetWhere): ''}
+${serviceName != 'cloud_control' ? generateSelectExamples(resourceName, hasList, hasGet, sqlExampleSelect, sqlExampleListCols, sqlExampleFrom, sqlExampleListWhere, sqlExampleGetCols, sqlExampleGetTagsCols, sqlExampleGetWhere, listOnlyResourceName, listOnlyFrom): ''}
 ${serviceName != 'cloud_control' ? createInsertExample(serviceName, resourceName, resourceData, schema, componentsSchemas): ''}
+${serviceName != 'cloud_control' ? createUpdateExample(serviceName, resourceName, resourceData, schema, componentsSchemas): ''}
 ${serviceName != 'cloud_control' ? createDeleteExample(serviceName, resourceName, resourceData, schema, componentsSchemas): ''}
 ${permissionsHeadingMarkdown}
 ${permissionsBylineMarkdown}
@@ -1094,7 +1176,7 @@ function getColumns(properties, isList, isCustom = false, is_tags = false){
 //     return fieldsTable;
 // }
 
-function generateSelectExamples(resourceName, hasList, hasGet, sqlExampleSelect, sqlExampleListCols, sqlExampleFrom, sqlExampleListWhere, sqlExampleGetCols, sqlExampleGetTagsCols, sqlExampleGetWhere){
+function generateSelectExamples(resourceName, hasList, hasGet, sqlExampleSelect, sqlExampleListCols, sqlExampleFrom, sqlExampleListWhere, sqlExampleGetCols, sqlExampleGetTagsCols, sqlExampleGetWhere, listOnlyResourceName, listOnlyFrom){
     let returnString = '';
     if(hasList || hasGet){
         returnString = `## ${mdCodeAnchor}SELECT${mdCodeAnchor} examples\n`;
@@ -1102,6 +1184,44 @@ function generateSelectExamples(resourceName, hasList, hasGet, sqlExampleSelect,
         return returnString;
     }
 
+    // Tabbed select for cloud_control resources with both get and list_only
+    if(listOnlyResourceName && hasGet && hasList){
+        const singularResourceName = pluralize.singular(resourceName);
+        const getDesc = `Gets all properties from an individual <code>${singularResourceName}</code>.`;
+        const listDesc = `Lists all <code>${resourceName}</code> in a region.`;
+        const listFromClause = listOnlyFrom || sqlExampleFrom;
+
+        returnString += `\n<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+${getDesc}
+${sqlCodeBlockStart}
+${sqlExampleSelect}
+${sqlExampleGetCols}
+${sqlExampleFrom}
+${sqlExampleGetWhere}
+${codeBlockEnd}
+</TabItem>
+<TabItem value="list">
+
+${listDesc}
+${sqlCodeBlockStart}
+${sqlExampleSelect}
+${sqlExampleListCols}
+${listFromClause}
+${sqlExampleListWhere}
+${codeBlockEnd}
+</TabItem>
+</Tabs>`;
+        return returnString;
+    }
+
     if(hasList){
         let listDesc = `Lists all <code>${resourceName.replace('_list_only','')}</code> in a region.`;
 
@@ -1111,11 +1231,10 @@ function generateSelectExamples(resourceName, hasList, hasGet, sqlExampleSelect,
             listDesc = `Expands tags for all <code>${pluralize.plural(resourceName.replace('_tags',''))}</code> in a region.`;
             returnString += `${listDesc}\n${sqlCodeBlockStart}\n${sqlExampleSelect}\n${sqlExampleGetTagsCols}\n${sqlExampleFrom}\n${sqlExampleListWhere}\n${codeBlockEnd}`;
         }
-    } 
+    }
 
     if(hasGet){
         const singularResourceName = pluralize.singular(resourceName);
-        // const getDesc = `Gets all properties from ${indefinite(singularResourceName, { articleOnly: true })} <code>${singularResourceName}</code>.`;
         const getDesc = `Gets all properties from an individual <code>${singularResourceName}</code>.`;
         returnString += `\n${getDesc}\n${sqlCodeBlockStart}\n${sqlExampleSelect}\n${sqlExampleGetCols}\n${sqlExampleFrom}\n${sqlExampleGetWhere}\n${codeBlockEnd}`;
     }
@@ -1123,21 +1242,25 @@ function generateSelectExamples(resourceName, hasList, hasGet, sqlExampleSelect,
     return returnString;
 }
 
-function generateMethodsTable(serviceName, resourceName, sqlVerbsList) {
-    
+function generateMethodsTable(serviceName, resourceName, sqlVerbsList, listOnlyResourceName) {
+    const hasResourceCol = !!listOnlyResourceName;
+
     let html = `
 <table>
 <tbody>
   <tr>
-    <th>Name</th>
+    <th>Name</th>${hasResourceCol ? '\n    <th>Resource</th>' : ''}
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>`;
 
     sqlVerbsList.forEach(item => {
+        const itemResource = (item.methodName === 'list_resources' && listOnlyResourceName)
+            ? listOnlyResourceName
+            : resourceName;
         html += `
   <tr>
-    <td><CopyableCode code="${item.methodName}" /></td>
+    <td><CopyableCode code="${item.methodName}" /></td>${hasResourceCol ? `\n    <td><code>${itemResource}</code></td>` : ''}
     <td><code>${item.sqlVerbName.toUpperCase()}</code></td>
     <td><CopyableCode code="${item.requiredParams}" /></td>
   </tr>`;
diff --git a/website/docs/index.md b/website/docs/index.md
index 6b51ef20e..bc3c63606 100644
--- a/website/docs/index.md
+++ b/website/docs/index.md
@@ -24,7 +24,7 @@ AWS Cloud Control API provider for StackQL.
 <div class="row">
 <div class="providerDocColumn">
 <span>total services:&nbsp;<b>237</b></span><br />
-<span>total resources:&nbsp;<b>2371</b></span><br />
+<span>total resources:&nbsp;<b>1233</b></span><br />
 </div>
 </div>
 
diff --git a/website/docs/services/accessanalyzer/analyzers/index.md b/website/docs/services/accessanalyzer/analyzers/index.md
index 7b6047eed..ae30480c6 100644
--- a/website/docs/services/accessanalyzer/analyzers/index.md
+++ b/website/docs/services/accessanalyzer/analyzers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>analyzer</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "analyzer_name",
@@ -166,6 +175,23 @@ Creates, updates, deletes or gets an <code>analyzer</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Amazon Resource Name (ARN) of the analyzer"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-accessanalyzer-analyzer.html"><code>AWS::AccessAnalyzer::Analyzer</code></a>.
 
@@ -175,31 +201,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>analyzers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>analyzers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>analyzers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>analyzers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>analyzers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -208,6 +240,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>analyzer</code>.
 ```sql
 SELECT
@@ -221,6 +262,19 @@ analyzer_configuration
 FROM awscc.accessanalyzer.analyzers
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>analyzers</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.accessanalyzer.analyzers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -326,6 +380,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.accessanalyzer.analyzers
+SET data__PatchDocument = string('{{ {
+    "ArchiveRules": archive_rules,
+    "Tags": tags,
+    "AnalyzerConfiguration": analyzer_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/accessanalyzer/analyzers_list_only/index.md b/website/docs/services/accessanalyzer/analyzers_list_only/index.md
deleted file mode 100644
index 46ff6921c..000000000
--- a/website/docs/services/accessanalyzer/analyzers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: analyzers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - analyzers_list_only
-  - accessanalyzer
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>analyzers</code> in a region or regions, for all properties use <a href="/services/accessanalyzer/analyzers/"><code>analyzers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>analyzers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::AccessAnalyzer::Analyzer type specifies an analyzer of the user's account</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.accessanalyzer.analyzers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Amazon Resource Name (ARN) of the analyzer"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>analyzers</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.accessanalyzer.analyzers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>analyzers_list_only</code> resource, see <a href="/services/accessanalyzer/analyzers/#permissions"><code>analyzers</code></a>
-
diff --git a/website/docs/services/accessanalyzer/index.md b/website/docs/services/accessanalyzer/index.md
index d02871b9a..0c0fee6fd 100644
--- a/website/docs/services/accessanalyzer/index.md
+++ b/website/docs/services/accessanalyzer/index.md
@@ -20,7 +20,7 @@ The accessanalyzer service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The accessanalyzer service documentation.
 <a href="/services/accessanalyzer/analyzers/">analyzers</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/accessanalyzer/analyzers_list_only/">analyzers_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/acmpca/certificate_authorities/index.md b/website/docs/services/acmpca/certificate_authorities/index.md
index 2d8edc670..b4616f27e 100644
--- a/website/docs/services/acmpca/certificate_authorities/index.md
+++ b/website/docs/services/acmpca/certificate_authorities/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>certificate_authority</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -389,6 +398,23 @@ Creates, updates, deletes or gets a <code>certificate_authority</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the certificate authority."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthority.html"><code>AWS::ACMPCA::CertificateAuthority</code></a>.
 
@@ -398,31 +424,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>certificate_authorities</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, KeyAlgorithm, SigningAlgorithm, Subject, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>certificate_authorities</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>certificate_authorities</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>certificate_authorities_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>certificate_authorities</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -431,6 +463,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>certificate_authority</code>.
 ```sql
 SELECT
@@ -449,6 +490,19 @@ usage_mode
 FROM awscc.acmpca.certificate_authorities
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>certificate_authorities</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.acmpca.certificate_authorities_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -606,6 +660,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.acmpca.certificate_authorities
+SET data__PatchDocument = string('{{ {
+    "RevocationConfiguration": revocation_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/acmpca/certificate_authorities_list_only/index.md b/website/docs/services/acmpca/certificate_authorities_list_only/index.md
deleted file mode 100644
index cef5719ec..000000000
--- a/website/docs/services/acmpca/certificate_authorities_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: certificate_authorities_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - certificate_authorities_list_only
-  - acmpca
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>certificate_authorities</code> in a region or regions, for all properties use <a href="/services/acmpca/certificate_authorities/"><code>certificate_authorities</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>certificate_authorities_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Private certificate authority.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.acmpca.certificate_authorities_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the certificate authority."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>certificate_authorities</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.acmpca.certificate_authorities_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>certificate_authorities_list_only</code> resource, see <a href="/services/acmpca/certificate_authorities/#permissions"><code>certificate_authorities</code></a>
-
diff --git a/website/docs/services/acmpca/certificate_authority_activations/index.md b/website/docs/services/acmpca/certificate_authority_activations/index.md
index 89c15c9c5..292a119c6 100644
--- a/website/docs/services/acmpca/certificate_authority_activations/index.md
+++ b/website/docs/services/acmpca/certificate_authority_activations/index.md
@@ -188,6 +188,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.acmpca.certificate_authority_activations
+SET data__PatchDocument = string('{{ {
+    "Certificate": certificate,
+    "CertificateChain": certificate_chain,
+    "Status": status
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CertificateAuthorityArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/acmpca/certificates/index.md b/website/docs/services/acmpca/certificates/index.md
index afd7712fe..7d74a5b77 100644
--- a/website/docs/services/acmpca/certificates/index.md
+++ b/website/docs/services/acmpca/certificates/index.md
@@ -535,6 +535,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/acmpca/index.md b/website/docs/services/acmpca/index.md
index 874bf9060..8b226459b 100644
--- a/website/docs/services/acmpca/index.md
+++ b/website/docs/services/acmpca/index.md
@@ -20,7 +20,7 @@ The acmpca service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>5</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,7 +30,6 @@ The acmpca service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/acmpca/certificate_authorities/">certificate_authorities</a><br />
-<a href="/services/acmpca/certificate_authorities_list_only/">certificate_authorities_list_only</a><br />
 <a href="/services/acmpca/certificate_authority_activations/">certificate_authority_activations</a>
 </div>
 <div class="providerDocColumn">
diff --git a/website/docs/services/acmpca/permissions/index.md b/website/docs/services/acmpca/permissions/index.md
index 12cc355fb..82c58997e 100644
--- a/website/docs/services/acmpca/permissions/index.md
+++ b/website/docs/services/acmpca/permissions/index.md
@@ -180,6 +180,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/aiops/index.md b/website/docs/services/aiops/index.md
index dbb549d1f..9b2f5b051 100644
--- a/website/docs/services/aiops/index.md
+++ b/website/docs/services/aiops/index.md
@@ -20,7 +20,7 @@ The aiops service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The aiops service documentation.
 <a href="/services/aiops/investigation_groups/">investigation_groups</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/aiops/investigation_groups_list_only/">investigation_groups_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/aiops/investigation_groups/index.md b/website/docs/services/aiops/investigation_groups/index.md
index 5d40d9786..a636f00a1 100644
--- a/website/docs/services/aiops/investigation_groups/index.md
+++ b/website/docs/services/aiops/investigation_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>investigation_group</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "role_arn",
@@ -136,6 +145,23 @@ Creates, updates, deletes or gets an <code>investigation_group</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Investigation Group's ARN."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aiops-investigationgroup.html"><code>AWS::AIOps::InvestigationGroup</code></a>.
 
@@ -145,31 +171,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>investigation_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>investigation_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>investigation_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>investigation_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>investigation_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -178,6 +210,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>investigation_group</code>.
 ```sql
 SELECT
@@ -200,6 +241,19 @@ tags
 FROM awscc.aiops.investigation_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>investigation_groups</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.aiops.investigation_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -305,6 +359,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.aiops.investigation_groups
+SET data__PatchDocument = string('{{ {
+    "RoleArn": role_arn,
+    "EncryptionConfig": encryption_config,
+    "InvestigationGroupPolicy": investigation_group_policy,
+    "IsCloudTrailEventHistoryEnabled": is_cloud_trail_event_history_enabled,
+    "TagKeyBoundaries": tag_key_boundaries,
+    "ChatbotNotificationChannels": chatbot_notification_channels,
+    "CrossAccountConfigurations": cross_account_configurations,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/aiops/investigation_groups_list_only/index.md b/website/docs/services/aiops/investigation_groups_list_only/index.md
deleted file mode 100644
index b586fd2ca..000000000
--- a/website/docs/services/aiops/investigation_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: investigation_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - investigation_groups_list_only
-  - aiops
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>investigation_groups</code> in a region or regions, for all properties use <a href="/services/aiops/investigation_groups/"><code>investigation_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>investigation_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::AIOps::InvestigationGroup Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.aiops.investigation_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Investigation Group's ARN."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>investigation_groups</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.aiops.investigation_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>investigation_groups_list_only</code> resource, see <a href="/services/aiops/investigation_groups/#permissions"><code>investigation_groups</code></a>
-
diff --git a/website/docs/services/amazonmq/brokers/index.md b/website/docs/services/amazonmq/brokers/index.md
index cf46f8db9..080551ff8 100644
--- a/website/docs/services/amazonmq/brokers/index.md
+++ b/website/docs/services/amazonmq/brokers/index.md
@@ -364,3 +364,4 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 
 
+
diff --git a/website/docs/services/amazonmq/configurations/index.md b/website/docs/services/amazonmq/configurations/index.md
index 6f499a012..ab9b22932 100644
--- a/website/docs/services/amazonmq/configurations/index.md
+++ b/website/docs/services/amazonmq/configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>configuration</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets a <code>configuration</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the Amazon MQ configuration."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-configuration.html"><code>AWS::AmazonMQ::Configuration</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EngineType, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>configuration</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ tags
 FROM awscc.amazonmq.configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>configurations</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.amazonmq.configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -249,6 +303,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.amazonmq.configurations
+SET data__PatchDocument = string('{{ {
+    "Data": data,
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/amazonmq/configurations_list_only/index.md b/website/docs/services/amazonmq/configurations_list_only/index.md
deleted file mode 100644
index 32b5b0ca9..000000000
--- a/website/docs/services/amazonmq/configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - configurations_list_only
-  - amazonmq
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>configurations</code> in a region or regions, for all properties use <a href="/services/amazonmq/configurations/"><code>configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AmazonMQ::Configuration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.amazonmq.configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the Amazon MQ configuration."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>configurations</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.amazonmq.configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>configurations_list_only</code> resource, see <a href="/services/amazonmq/configurations/#permissions"><code>configurations</code></a>
-
diff --git a/website/docs/services/amazonmq/index.md b/website/docs/services/amazonmq/index.md
index b85e4eabe..57cf2c0b7 100644
--- a/website/docs/services/amazonmq/index.md
+++ b/website/docs/services/amazonmq/index.md
@@ -20,7 +20,7 @@ The amazonmq service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>3</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,10 +29,9 @@ The amazonmq service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/amazonmq/brokers/">brokers</a><br />
-<a href="/services/amazonmq/configurations/">configurations</a>
+<a href="/services/amazonmq/brokers/">brokers</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/amazonmq/configurations_list_only/">configurations_list_only</a>
+<a href="/services/amazonmq/configurations/">configurations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/amplify/apps/index.md b/website/docs/services/amplify/apps/index.md
index 929fe6354..a7cf5766c 100644
--- a/website/docs/services/amplify/apps/index.md
+++ b/website/docs/services/amplify/apps/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>app</code> resource or lists <code>ap
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "access_token",
@@ -313,6 +322,23 @@ Creates, updates, deletes or gets an <code>app</code> resource or lists <code>ap
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html"><code>AWS::Amplify::App</code></a>.
 
@@ -322,31 +348,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>apps</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>apps</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>apps</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>apps_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>apps</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -355,6 +387,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>app</code>.
 ```sql
 SELECT
@@ -384,6 +425,19 @@ job_config
 FROM awscc.amplify.apps
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>apps</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.amplify.apps_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -538,6 +592,36 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.amplify.apps
+SET data__PatchDocument = string('{{ {
+    "AccessToken": access_token,
+    "AutoBranchCreationConfig": auto_branch_creation_config,
+    "BasicAuthConfig": basic_auth_config,
+    "BuildSpec": build_spec,
+    "CacheConfig": cache_config,
+    "ComputeRoleArn": compute_role_arn,
+    "CustomHeaders": custom_headers,
+    "CustomRules": custom_rules,
+    "Description": description,
+    "EnableBranchAutoDeletion": enable_branch_auto_deletion,
+    "EnvironmentVariables": environment_variables,
+    "IAMServiceRole": iam_service_role,
+    "Name": name,
+    "OauthToken": oauth_token,
+    "Platform": platform,
+    "Repository": repository,
+    "Tags": tags,
+    "JobConfig": job_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/amplify/apps_list_only/index.md b/website/docs/services/amplify/apps_list_only/index.md
deleted file mode 100644
index 4a99bd264..000000000
--- a/website/docs/services/amplify/apps_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: apps_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - apps_list_only
-  - amplify
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>apps</code> in a region or regions, for all properties use <a href="/services/amplify/apps/"><code>apps</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>apps_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Amplify::App resource creates Apps in the Amplify Console. An App is a collection of branches.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.amplify.apps_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>apps</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.amplify.apps_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>apps_list_only</code> resource, see <a href="/services/amplify/apps/#permissions"><code>apps</code></a>
-
diff --git a/website/docs/services/amplify/branches/index.md b/website/docs/services/amplify/branches/index.md
index 35d1c53f6..1d5c4b28f 100644
--- a/website/docs/services/amplify/branches/index.md
+++ b/website/docs/services/amplify/branches/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>branch</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "app_id",
@@ -173,6 +182,23 @@ Creates, updates, deletes or gets a <code>branch</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html"><code>AWS::Amplify::Branch</code></a>.
 
@@ -182,31 +208,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>branches</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AppId, BranchName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>branches</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>branches</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>branches_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>branches</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -215,6 +247,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>branch</code>.
 ```sql
 SELECT
@@ -239,6 +280,19 @@ tags
 FROM awscc.amplify.branches
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>branches</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.amplify.branches_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -369,6 +423,32 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.amplify.branches
+SET data__PatchDocument = string('{{ {
+    "BasicAuthConfig": basic_auth_config,
+    "Backend": backend,
+    "BuildSpec": build_spec,
+    "ComputeRoleArn": compute_role_arn,
+    "Description": description,
+    "EnableAutoBuild": enable_auto_build,
+    "EnablePerformanceMode": enable_performance_mode,
+    "EnablePullRequestPreview": enable_pull_request_preview,
+    "EnableSkewProtection": enable_skew_protection,
+    "EnvironmentVariables": environment_variables,
+    "Framework": framework,
+    "PullRequestEnvironmentName": pull_request_environment_name,
+    "Stage": stage,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/amplify/branches_list_only/index.md b/website/docs/services/amplify/branches_list_only/index.md
deleted file mode 100644
index e69712587..000000000
--- a/website/docs/services/amplify/branches_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: branches_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - branches_list_only
-  - amplify
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>branches</code> in a region or regions, for all properties use <a href="/services/amplify/branches/"><code>branches</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>branches_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Amplify::Branch resource creates a new branch within an app.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.amplify.branches_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>branches</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.amplify.branches_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>branches_list_only</code> resource, see <a href="/services/amplify/branches/#permissions"><code>branches</code></a>
-
diff --git a/website/docs/services/amplify/domains/index.md b/website/docs/services/amplify/domains/index.md
index 8c2a487cb..1d9dcb2f2 100644
--- a/website/docs/services/amplify/domains/index.md
+++ b/website/docs/services/amplify/domains/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>domain</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "app_id",
@@ -146,6 +155,23 @@ Creates, updates, deletes or gets a <code>domain</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-domain.html"><code>AWS::Amplify::Domain</code></a>.
 
@@ -155,31 +181,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AppId, DomainName, SubDomainSettings, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>domains_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -188,6 +220,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>domain</code>.
 ```sql
 SELECT
@@ -208,6 +249,19 @@ sub_domain_settings
 FROM awscc.amplify.domains
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>domains</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.amplify.domains_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -301,6 +355,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.amplify.domains
+SET data__PatchDocument = string('{{ {
+    "AutoSubDomainCreationPatterns": auto_sub_domain_creation_patterns,
+    "AutoSubDomainIAMRole": auto_sub_domain_iam_role,
+    "CertificateSettings": certificate_settings,
+    "EnableAutoSubDomain": enable_auto_sub_domain,
+    "SubDomainSettings": sub_domain_settings
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/amplify/domains_list_only/index.md b/website/docs/services/amplify/domains_list_only/index.md
deleted file mode 100644
index e11a5bda7..000000000
--- a/website/docs/services/amplify/domains_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: domains_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - domains_list_only
-  - amplify
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>domains</code> in a region or regions, for all properties use <a href="/services/amplify/domains/"><code>domains</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>domains_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Amplify::Domain resource allows you to connect a custom domain to your app.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.amplify.domains_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>domains</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.amplify.domains_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>domains_list_only</code> resource, see <a href="/services/amplify/domains/#permissions"><code>domains</code></a>
-
diff --git a/website/docs/services/amplify/index.md b/website/docs/services/amplify/index.md
index 083c4d9de..175eb4dbe 100644
--- a/website/docs/services/amplify/index.md
+++ b/website/docs/services/amplify/index.md
@@ -20,7 +20,7 @@ The amplify service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The amplify service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/amplify/apps/">apps</a><br />
-<a href="/services/amplify/apps_list_only/">apps_list_only</a><br />
 <a href="/services/amplify/branches/">branches</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/amplify/branches_list_only/">branches_list_only</a><br />
-<a href="/services/amplify/domains/">domains</a><br />
-<a href="/services/amplify/domains_list_only/">domains_list_only</a>
+<a href="/services/amplify/domains/">domains</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/amplifyuibuilder/components/index.md b/website/docs/services/amplifyuibuilder/components/index.md
index a9a67cf73..7d4651584 100644
--- a/website/docs/services/amplifyuibuilder/components/index.md
+++ b/website/docs/services/amplifyuibuilder/components/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>component</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "app_id",
@@ -164,6 +173,38 @@ Creates, updates, deletes or gets a <code>component</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "app_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "environment_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-component.html"><code>AWS::AmplifyUIBuilder::Component</code></a>.
 
@@ -173,31 +214,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>components</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>components</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>components</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>components_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>components</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -206,6 +253,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>component</code>.
 ```sql
 SELECT
@@ -230,6 +286,21 @@ variants
 FROM awscc.amplifyuibuilder.components
 WHERE region = 'us-east-1' AND data__Identifier = '<AppId>|<EnvironmentName>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>components</code> in a region.
+```sql
+SELECT
+region,
+app_id,
+environment_name,
+id
+FROM awscc.amplifyuibuilder.components_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -377,6 +448,30 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.amplifyuibuilder.components
+SET data__PatchDocument = string('{{ {
+    "BindingProperties": binding_properties,
+    "Children": children,
+    "CollectionProperties": collection_properties,
+    "ComponentType": component_type,
+    "Events": events,
+    "Name": name,
+    "Overrides": overrides,
+    "Properties": properties,
+    "SchemaVersion": schema_version,
+    "SourceId": source_id,
+    "Tags": tags,
+    "Variants": variants
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AppId>|<EnvironmentName>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/amplifyuibuilder/components_list_only/index.md b/website/docs/services/amplifyuibuilder/components_list_only/index.md
deleted file mode 100644
index 53360680b..000000000
--- a/website/docs/services/amplifyuibuilder/components_list_only/index.md
+++ /dev/null
@@ -1,97 +0,0 @@
----
-title: components_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - components_list_only
-  - amplifyuibuilder
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>components</code> in a region or regions, for all properties use <a href="/services/amplifyuibuilder/components/"><code>components</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>components_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::AmplifyUIBuilder::Component Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.amplifyuibuilder.components_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "app_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "environment_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>components</code> in a region.
-```sql
-SELECT
-region,
-app_id,
-environment_name,
-id
-FROM awscc.amplifyuibuilder.components_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>components_list_only</code> resource, see <a href="/services/amplifyuibuilder/components/#permissions"><code>components</code></a>
-
diff --git a/website/docs/services/amplifyuibuilder/forms/index.md b/website/docs/services/amplifyuibuilder/forms/index.md
index b472e4daf..becfca9d1 100644
--- a/website/docs/services/amplifyuibuilder/forms/index.md
+++ b/website/docs/services/amplifyuibuilder/forms/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>form</code> resource or lists <code>fo
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "app_id",
@@ -153,6 +162,38 @@ Creates, updates, deletes or gets a <code>form</code> resource or lists <code>fo
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "app_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "environment_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-form.html"><code>AWS::AmplifyUIBuilder::Form</code></a>.
 
@@ -162,31 +203,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>forms</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>forms</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>forms</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>forms_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>forms</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -195,6 +242,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>form</code>.
 ```sql
 SELECT
@@ -215,6 +271,21 @@ tags
 FROM awscc.amplifyuibuilder.forms
 WHERE region = 'us-east-1' AND data__Identifier = '<AppId>|<EnvironmentName>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>forms</code> in a region.
+```sql
+SELECT
+region,
+app_id,
+environment_name,
+id
+FROM awscc.amplifyuibuilder.forms_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -353,6 +424,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.amplifyuibuilder.forms
+SET data__PatchDocument = string('{{ {
+    "Cta": cta,
+    "DataType": data_type,
+    "Fields": fields,
+    "FormActionType": form_action_type,
+    "LabelDecorator": label_decorator,
+    "Name": name,
+    "SchemaVersion": schema_version,
+    "SectionalElements": sectional_elements,
+    "Style": style,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AppId>|<EnvironmentName>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/amplifyuibuilder/forms_list_only/index.md b/website/docs/services/amplifyuibuilder/forms_list_only/index.md
deleted file mode 100644
index e780d9c8a..000000000
--- a/website/docs/services/amplifyuibuilder/forms_list_only/index.md
+++ /dev/null
@@ -1,97 +0,0 @@
----
-title: forms_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - forms_list_only
-  - amplifyuibuilder
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>forms</code> in a region or regions, for all properties use <a href="/services/amplifyuibuilder/forms/"><code>forms</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>forms_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::AmplifyUIBuilder::Form Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.amplifyuibuilder.forms_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "app_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "environment_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>forms</code> in a region.
-```sql
-SELECT
-region,
-app_id,
-environment_name,
-id
-FROM awscc.amplifyuibuilder.forms_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>forms_list_only</code> resource, see <a href="/services/amplifyuibuilder/forms/#permissions"><code>forms</code></a>
-
diff --git a/website/docs/services/amplifyuibuilder/index.md b/website/docs/services/amplifyuibuilder/index.md
index 85c1d4809..16f9f24b5 100644
--- a/website/docs/services/amplifyuibuilder/index.md
+++ b/website/docs/services/amplifyuibuilder/index.md
@@ -20,7 +20,7 @@ The amplifyuibuilder service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The amplifyuibuilder service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/amplifyuibuilder/components/">components</a><br />
-<a href="/services/amplifyuibuilder/components_list_only/">components_list_only</a><br />
 <a href="/services/amplifyuibuilder/forms/">forms</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/amplifyuibuilder/forms_list_only/">forms_list_only</a><br />
-<a href="/services/amplifyuibuilder/themes/">themes</a><br />
-<a href="/services/amplifyuibuilder/themes_list_only/">themes_list_only</a>
+<a href="/services/amplifyuibuilder/themes/">themes</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/amplifyuibuilder/themes/index.md b/website/docs/services/amplifyuibuilder/themes/index.md
index e9addcef2..abbf46d33 100644
--- a/website/docs/services/amplifyuibuilder/themes/index.md
+++ b/website/docs/services/amplifyuibuilder/themes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>theme</code> resource or lists <code>t
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "app_id",
@@ -109,6 +118,38 @@ Creates, updates, deletes or gets a <code>theme</code> resource or lists <code>t
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "app_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "environment_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-theme.html"><code>AWS::AmplifyUIBuilder::Theme</code></a>.
 
@@ -118,31 +159,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>themes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>themes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>themes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>themes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>themes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +198,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>theme</code>.
 ```sql
 SELECT
@@ -167,6 +223,21 @@ values
 FROM awscc.amplifyuibuilder.themes
 WHERE region = 'us-east-1' AND data__Identifier = '<AppId>|<EnvironmentName>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>themes</code> in a region.
+```sql
+SELECT
+region,
+app_id,
+environment_name,
+id
+FROM awscc.amplifyuibuilder.themes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -263,6 +334,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.amplifyuibuilder.themes
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Overrides": overrides,
+    "Tags": tags,
+    "Values": values
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AppId>|<EnvironmentName>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/amplifyuibuilder/themes_list_only/index.md b/website/docs/services/amplifyuibuilder/themes_list_only/index.md
deleted file mode 100644
index c30866d96..000000000
--- a/website/docs/services/amplifyuibuilder/themes_list_only/index.md
+++ /dev/null
@@ -1,97 +0,0 @@
----
-title: themes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - themes_list_only
-  - amplifyuibuilder
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>themes</code> in a region or regions, for all properties use <a href="/services/amplifyuibuilder/themes/"><code>themes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>themes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::AmplifyUIBuilder::Theme Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.amplifyuibuilder.themes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "app_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "environment_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>themes</code> in a region.
-```sql
-SELECT
-region,
-app_id,
-environment_name,
-id
-FROM awscc.amplifyuibuilder.themes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>themes_list_only</code> resource, see <a href="/services/amplifyuibuilder/themes/#permissions"><code>themes</code></a>
-
diff --git a/website/docs/services/apigateway/accounts/index.md b/website/docs/services/apigateway/accounts/index.md
index 2d1c8c069..6e1a4a9f9 100644
--- a/website/docs/services/apigateway/accounts/index.md
+++ b/website/docs/services/apigateway/accounts/index.md
@@ -156,6 +156,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.accounts
+SET data__PatchDocument = string('{{ {
+    "CloudWatchRoleArn": cloud_watch_role_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/api_keys/index.md b/website/docs/services/apigateway/api_keys/index.md
index 567a88edd..b9ba968cc 100644
--- a/website/docs/services/apigateway/api_keys/index.md
+++ b/website/docs/services/apigateway/api_keys/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>api_key</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "api_key_id",
@@ -109,6 +118,23 @@ Creates, updates, deletes or gets an <code>api_key</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "api_key_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html"><code>AWS::ApiGateway::ApiKey</code></a>.
 
@@ -118,31 +144,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>api_keys</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>api_keys</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>api_keys</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>api_keys_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>api_keys</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +183,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>api_key</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ value
 FROM awscc.apigateway.api_keys
 WHERE region = 'us-east-1' AND data__Identifier = '<APIKeyId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>api_keys</code> in a region.
+```sql
+SELECT
+region,
+api_key_id
+FROM awscc.apigateway.api_keys_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -273,6 +327,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.api_keys
+SET data__PatchDocument = string('{{ {
+    "CustomerId": customer_id,
+    "Description": description,
+    "Enabled": enabled,
+    "StageKeys": stage_keys,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<APIKeyId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/api_keys_list_only/index.md b/website/docs/services/apigateway/api_keys_list_only/index.md
deleted file mode 100644
index dd7a31f52..000000000
--- a/website/docs/services/apigateway/api_keys_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: api_keys_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - api_keys_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>api_keys</code> in a region or regions, for all properties use <a href="/services/apigateway/api_keys/"><code>api_keys</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>api_keys_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::ApiKey&#96;&#96; resource creates a unique key that you can distribute to clients who are executing API Gateway &#96;&#96;Method&#96;&#96; resources that require an API key. To specify which API key clients must use, map the API key with the &#96;&#96;RestApi&#96;&#96; and &#96;&#96;Stage&#96;&#96; resources that include the methods that require a key.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.api_keys_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "api_key_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>api_keys</code> in a region.
-```sql
-SELECT
-region,
-api_key_id
-FROM awscc.apigateway.api_keys_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>api_keys_list_only</code> resource, see <a href="/services/apigateway/api_keys/#permissions"><code>api_keys</code></a>
-
diff --git a/website/docs/services/apigateway/authorizers/index.md b/website/docs/services/apigateway/authorizers/index.md
index 63935a522..815c0098c 100644
--- a/website/docs/services/apigateway/authorizers/index.md
+++ b/website/docs/services/apigateway/authorizers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>authorizer</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "rest_api_id",
@@ -95,6 +104,28 @@ Creates, updates, deletes or gets an <code>authorizer</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "rest_api_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "authorizer_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html"><code>AWS::ApiGateway::Authorizer</code></a>.
 
@@ -104,31 +135,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>authorizers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RestApiId, Type, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>authorizers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>authorizers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>authorizers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>authorizers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -137,6 +174,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>authorizer</code>.
 ```sql
 SELECT
@@ -155,6 +201,20 @@ type
 FROM awscc.apigateway.authorizers
 WHERE region = 'us-east-1' AND data__Identifier = '<RestApiId>|<AuthorizerId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>authorizers</code> in a region.
+```sql
+SELECT
+region,
+rest_api_id,
+authorizer_id
+FROM awscc.apigateway.authorizers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -256,6 +316,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.authorizers
+SET data__PatchDocument = string('{{ {
+    "AuthType": auth_type,
+    "AuthorizerCredentials": authorizer_credentials,
+    "AuthorizerResultTtlInSeconds": authorizer_result_ttl_in_seconds,
+    "AuthorizerUri": authorizer_uri,
+    "IdentitySource": identity_source,
+    "IdentityValidationExpression": identity_validation_expression,
+    "Name": name,
+    "ProviderARNs": provider_arns,
+    "Type": type
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RestApiId>|<AuthorizerId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/authorizers_list_only/index.md b/website/docs/services/apigateway/authorizers_list_only/index.md
deleted file mode 100644
index 758d54396..000000000
--- a/website/docs/services/apigateway/authorizers_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: authorizers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - authorizers_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>authorizers</code> in a region or regions, for all properties use <a href="/services/apigateway/authorizers/"><code>authorizers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>authorizers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::Authorizer&#96;&#96; resource creates an authorization layer that API Gateway activates for methods that have authorization enabled. API Gateway activates the authorizer when a client calls those methods.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.authorizers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "rest_api_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "authorizer_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>authorizers</code> in a region.
-```sql
-SELECT
-region,
-rest_api_id,
-authorizer_id
-FROM awscc.apigateway.authorizers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>authorizers_list_only</code> resource, see <a href="/services/apigateway/authorizers/#permissions"><code>authorizers</code></a>
-
diff --git a/website/docs/services/apigateway/base_path_mapping_v2s/index.md b/website/docs/services/apigateway/base_path_mapping_v2s/index.md
index f4d4987c9..45a69d97c 100644
--- a/website/docs/services/apigateway/base_path_mapping_v2s/index.md
+++ b/website/docs/services/apigateway/base_path_mapping_v2s/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>base_path_mapping_v2</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "base_path",
@@ -65,6 +74,28 @@ Creates, updates, deletes or gets a <code>base_path_mapping_v2</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "base_path",
+    "type": "string",
+    "description": "The base path name that callers of the API must provide in the URL after the domain name."
+  },
+  {
+    "name": "base_path_mapping_arn",
+    "type": "string",
+    "description": "Amazon Resource Name (ARN) of the resource."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-basepathmappingv2.html"><code>AWS::ApiGateway::BasePathMappingV2</code></a>.
 
@@ -74,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>base_path_mapping_v2s</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainNameArn, RestApiId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>base_path_mapping_v2s</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>base_path_mapping_v2s</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>base_path_mapping_v2s_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>base_path_mapping_v2s</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>base_path_mapping_v2</code>.
 ```sql
 SELECT
@@ -119,6 +165,19 @@ base_path_mapping_arn
 FROM awscc.apigateway.base_path_mapping_v2s
 WHERE region = 'us-east-1' AND data__Identifier = '<BasePathMappingArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>base_path_mapping_v2s</code> in a region.
+```sql
+SELECT
+region,
+base_path_mapping_arn
+FROM awscc.apigateway.base_path_mapping_v2s_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -193,6 +252,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.base_path_mapping_v2s
+SET data__PatchDocument = string('{{ {
+    "RestApiId": rest_api_id,
+    "Stage": stage
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<BasePathMappingArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/base_path_mapping_v2s_list_only/index.md b/website/docs/services/apigateway/base_path_mapping_v2s_list_only/index.md
deleted file mode 100644
index e357dc779..000000000
--- a/website/docs/services/apigateway/base_path_mapping_v2s_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: base_path_mapping_v2s_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - base_path_mapping_v2s_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>base_path_mapping_v2s</code> in a region or regions, for all properties use <a href="/services/apigateway/base_path_mapping_v2s/"><code>base_path_mapping_v2s</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>base_path_mapping_v2s_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ApiGateway::BasePathMappingV2</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.base_path_mapping_v2s_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "base_path",
-    "type": "string",
-    "description": "The base path name that callers of the API must provide in the URL after the domain name."
-  },
-  {
-    "name": "base_path_mapping_arn",
-    "type": "string",
-    "description": "Amazon Resource Name (ARN) of the resource."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>base_path_mapping_v2s</code> in a region.
-```sql
-SELECT
-region,
-base_path_mapping_arn
-FROM awscc.apigateway.base_path_mapping_v2s_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>base_path_mapping_v2s_list_only</code> resource, see <a href="/services/apigateway/base_path_mapping_v2s/#permissions"><code>base_path_mapping_v2s</code></a>
-
diff --git a/website/docs/services/apigateway/base_path_mappings/index.md b/website/docs/services/apigateway/base_path_mappings/index.md
index 793ac97ba..3a84d4966 100644
--- a/website/docs/services/apigateway/base_path_mappings/index.md
+++ b/website/docs/services/apigateway/base_path_mappings/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>base_path_mapping</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "base_path",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets a <code>base_path_mapping</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "base_path",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "domain_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-basepathmapping.html"><code>AWS::ApiGateway::BasePathMapping</code></a>.
 
@@ -69,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>base_path_mappings</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>base_path_mappings</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>base_path_mappings</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>base_path_mappings_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>base_path_mappings</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>base_path_mapping</code>.
 ```sql
 SELECT
@@ -113,6 +159,20 @@ stage
 FROM awscc.apigateway.base_path_mappings
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainName>|<BasePath>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>base_path_mappings</code> in a region.
+```sql
+SELECT
+region,
+domain_name,
+base_path
+FROM awscc.apigateway.base_path_mappings_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -185,6 +245,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.base_path_mappings
+SET data__PatchDocument = string('{{ {
+    "RestApiId": rest_api_id,
+    "Stage": stage
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainName>|<BasePath>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/base_path_mappings_list_only/index.md b/website/docs/services/apigateway/base_path_mappings_list_only/index.md
deleted file mode 100644
index 0a8a03c7a..000000000
--- a/website/docs/services/apigateway/base_path_mappings_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: base_path_mappings_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - base_path_mappings_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>base_path_mappings</code> in a region or regions, for all properties use <a href="/services/apigateway/base_path_mappings/"><code>base_path_mappings</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>base_path_mappings_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::BasePathMapping&#96;&#96; resource creates a base path that clients who call your API must use in the invocation URL.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.base_path_mappings_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "base_path",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "domain_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>base_path_mappings</code> in a region.
-```sql
-SELECT
-region,
-domain_name,
-base_path
-FROM awscc.apigateway.base_path_mappings_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>base_path_mappings_list_only</code> resource, see <a href="/services/apigateway/base_path_mappings/#permissions"><code>base_path_mappings</code></a>
-
diff --git a/website/docs/services/apigateway/client_certificates/index.md b/website/docs/services/apigateway/client_certificates/index.md
index 052e5a538..77bd020c6 100644
--- a/website/docs/services/apigateway/client_certificates/index.md
+++ b/website/docs/services/apigateway/client_certificates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>client_certificate</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "client_certificate_id",
@@ -67,6 +76,23 @@ Creates, updates, deletes or gets a <code>client_certificate</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "client_certificate_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-clientcertificate.html"><code>AWS::ApiGateway::ClientCertificate</code></a>.
 
@@ -76,31 +102,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>client_certificates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>client_certificates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>client_certificates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>client_certificates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>client_certificates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -109,6 +141,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>client_certificate</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ tags
 FROM awscc.apigateway.client_certificates
 WHERE region = 'us-east-1' AND data__Identifier = '<ClientCertificateId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>client_certificates</code> in a region.
+```sql
+SELECT
+region,
+client_certificate_id
+FROM awscc.apigateway.client_certificates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -187,6 +241,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.client_certificates
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ClientCertificateId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/client_certificates_list_only/index.md b/website/docs/services/apigateway/client_certificates_list_only/index.md
deleted file mode 100644
index 9f32db0a8..000000000
--- a/website/docs/services/apigateway/client_certificates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: client_certificates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - client_certificates_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>client_certificates</code> in a region or regions, for all properties use <a href="/services/apigateway/client_certificates/"><code>client_certificates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>client_certificates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::ClientCertificate&#96;&#96; resource creates a client certificate that API Gateway uses to configure client-side SSL authentication for sending requests to the integration endpoint.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.client_certificates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "client_certificate_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>client_certificates</code> in a region.
-```sql
-SELECT
-region,
-client_certificate_id
-FROM awscc.apigateway.client_certificates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>client_certificates_list_only</code> resource, see <a href="/services/apigateway/client_certificates/#permissions"><code>client_certificates</code></a>
-
diff --git a/website/docs/services/apigateway/deployments/index.md b/website/docs/services/apigateway/deployments/index.md
index d17ea555a..35945007a 100644
--- a/website/docs/services/apigateway/deployments/index.md
+++ b/website/docs/services/apigateway/deployments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "deployment_id",
@@ -282,6 +291,28 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "deployment_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "rest_api_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-deployment.html"><code>AWS::ApiGateway::Deployment</code></a>.
 
@@ -291,31 +322,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RestApiId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>deployments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -324,6 +361,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>deployment</code>.
 ```sql
 SELECT
@@ -337,6 +383,20 @@ deployment_canary_settings
 FROM awscc.apigateway.deployments
 WHERE region = 'us-east-1' AND data__Identifier = '<DeploymentId>|<RestApiId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>deployments</code> in a region.
+```sql
+SELECT
+region,
+deployment_id,
+rest_api_id
+FROM awscc.apigateway.deployments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -453,6 +513,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.deployments
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "StageDescription": stage_description,
+    "StageName": stage_name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DeploymentId>|<RestApiId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/deployments_list_only/index.md b/website/docs/services/apigateway/deployments_list_only/index.md
deleted file mode 100644
index 3d0c38c11..000000000
--- a/website/docs/services/apigateway/deployments_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: deployments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - deployments_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>deployments</code> in a region or regions, for all properties use <a href="/services/apigateway/deployments/"><code>deployments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>deployments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::Deployment&#96;&#96; resource deploys an API Gateway &#96;&#96;RestApi&#96;&#96; resource to a stage so that clients can call the API over the internet. The stage acts as an environment.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.deployments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "deployment_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "rest_api_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>deployments</code> in a region.
-```sql
-SELECT
-region,
-deployment_id,
-rest_api_id
-FROM awscc.apigateway.deployments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>deployments_list_only</code> resource, see <a href="/services/apigateway/deployments/#permissions"><code>deployments</code></a>
-
diff --git a/website/docs/services/apigateway/documentation_parts/index.md b/website/docs/services/apigateway/documentation_parts/index.md
index 0f600f8cb..18ebcff7d 100644
--- a/website/docs/services/apigateway/documentation_parts/index.md
+++ b/website/docs/services/apigateway/documentation_parts/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>documentation_part</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "documentation_part_id",
@@ -87,6 +96,28 @@ Creates, updates, deletes or gets a <code>documentation_part</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "documentation_part_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "rest_api_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationpart.html"><code>AWS::ApiGateway::DocumentationPart</code></a>.
 
@@ -96,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>documentation_parts</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Location, Properties, RestApiId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>documentation_parts</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>documentation_parts</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>documentation_parts_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>documentation_parts</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>documentation_part</code>.
 ```sql
 SELECT
@@ -140,6 +186,20 @@ rest_api_id
 FROM awscc.apigateway.documentation_parts
 WHERE region = 'us-east-1' AND data__Identifier = '<DocumentationPartId>|<RestApiId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>documentation_parts</code> in a region.
+```sql
+SELECT
+region,
+documentation_part_id,
+rest_api_id
+FROM awscc.apigateway.documentation_parts_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +277,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.documentation_parts
+SET data__PatchDocument = string('{{ {
+    "Properties": properties
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DocumentationPartId>|<RestApiId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/documentation_parts_list_only/index.md b/website/docs/services/apigateway/documentation_parts_list_only/index.md
deleted file mode 100644
index db6899535..000000000
--- a/website/docs/services/apigateway/documentation_parts_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: documentation_parts_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - documentation_parts_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>documentation_parts</code> in a region or regions, for all properties use <a href="/services/apigateway/documentation_parts/"><code>documentation_parts</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>documentation_parts_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::DocumentationPart&#96;&#96; resource creates a documentation part for an API. For more information, see &#91;Representation of API Documentation in API Gateway&#93;(https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-documenting-api-content-representation.html) in the &#42;API Gateway Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.documentation_parts_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "documentation_part_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "rest_api_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>documentation_parts</code> in a region.
-```sql
-SELECT
-region,
-documentation_part_id,
-rest_api_id
-FROM awscc.apigateway.documentation_parts_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>documentation_parts_list_only</code> resource, see <a href="/services/apigateway/documentation_parts/#permissions"><code>documentation_parts</code></a>
-
diff --git a/website/docs/services/apigateway/documentation_versions/index.md b/website/docs/services/apigateway/documentation_versions/index.md
index 6818e435b..1b7bf7844 100644
--- a/website/docs/services/apigateway/documentation_versions/index.md
+++ b/website/docs/services/apigateway/documentation_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>documentation_version</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -55,6 +64,28 @@ Creates, updates, deletes or gets a <code>documentation_version</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "documentation_version",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "rest_api_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationversion.html"><code>AWS::ApiGateway::DocumentationVersion</code></a>.
 
@@ -64,31 +95,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>documentation_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DocumentationVersion, RestApiId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>documentation_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>documentation_versions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>documentation_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>documentation_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +134,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>documentation_version</code>.
 ```sql
 SELECT
@@ -107,6 +153,20 @@ rest_api_id
 FROM awscc.apigateway.documentation_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<DocumentationVersion>|<RestApiId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>documentation_versions</code> in a region.
+```sql
+SELECT
+region,
+documentation_version,
+rest_api_id
+FROM awscc.apigateway.documentation_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -177,6 +237,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.documentation_versions
+SET data__PatchDocument = string('{{ {
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DocumentationVersion>|<RestApiId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/documentation_versions_list_only/index.md b/website/docs/services/apigateway/documentation_versions_list_only/index.md
deleted file mode 100644
index cc93c7e0b..000000000
--- a/website/docs/services/apigateway/documentation_versions_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: documentation_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - documentation_versions_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>documentation_versions</code> in a region or regions, for all properties use <a href="/services/apigateway/documentation_versions/"><code>documentation_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>documentation_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::DocumentationVersion&#96;&#96; resource creates a snapshot of the documentation for an API. For more information, see &#91;Representation of API Documentation in API Gateway&#93;(https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-documenting-api-content-representation.html) in the &#42;API Gateway Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.documentation_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "documentation_version",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "rest_api_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>documentation_versions</code> in a region.
-```sql
-SELECT
-region,
-documentation_version,
-rest_api_id
-FROM awscc.apigateway.documentation_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>documentation_versions_list_only</code> resource, see <a href="/services/apigateway/documentation_versions/#permissions"><code>documentation_versions</code></a>
-
diff --git a/website/docs/services/apigateway/domain_name_access_associations/index.md b/website/docs/services/apigateway/domain_name_access_associations/index.md
index 8a90111cd..d86a3896c 100644
--- a/website/docs/services/apigateway/domain_name_access_associations/index.md
+++ b/website/docs/services/apigateway/domain_name_access_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>domain_name_access_association</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain_name_access_association_arn",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>domain_name_access_association</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_name_access_association_arn",
+    "type": "string",
+    "description": "The amazon resource name (ARN) of the domain name access association resource."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainnameaccessassociation.html"><code>AWS::ApiGateway::DomainNameAccessAssociation</code></a>.
 
@@ -86,26 +112,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>domain_name_access_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainNameArn, AccessAssociationSource, AccessAssociationSourceType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>domain_name_access_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>domain_name_access_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>domain_name_access_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +145,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>domain_name_access_association</code>.
 ```sql
 SELECT
@@ -126,6 +166,19 @@ tags
 FROM awscc.apigateway.domain_name_access_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainNameAccessAssociationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>domain_name_access_associations</code> in a region.
+```sql
+SELECT
+region,
+domain_name_access_association_arn
+FROM awscc.apigateway.domain_name_access_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -204,6 +257,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/domain_name_access_associations_list_only/index.md b/website/docs/services/apigateway/domain_name_access_associations_list_only/index.md
deleted file mode 100644
index 3a9c6b15c..000000000
--- a/website/docs/services/apigateway/domain_name_access_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: domain_name_access_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - domain_name_access_associations_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>domain_name_access_associations</code> in a region or regions, for all properties use <a href="/services/apigateway/domain_name_access_associations/"><code>domain_name_access_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>domain_name_access_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ApiGateway::DomainNameAccessAssociation.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.domain_name_access_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_name_access_association_arn",
-    "type": "string",
-    "description": "The amazon resource name (ARN) of the domain name access association resource."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>domain_name_access_associations</code> in a region.
-```sql
-SELECT
-region,
-domain_name_access_association_arn
-FROM awscc.apigateway.domain_name_access_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>domain_name_access_associations_list_only</code> resource, see <a href="/services/apigateway/domain_name_access_associations/#permissions"><code>domain_name_access_associations</code></a>
-
diff --git a/website/docs/services/apigateway/domain_name_v2s/index.md b/website/docs/services/apigateway/domain_name_v2s/index.md
index c30720237..6aad5b234 100644
--- a/website/docs/services/apigateway/domain_name_v2s/index.md
+++ b/website/docs/services/apigateway/domain_name_v2s/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>domain_name_v2</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "certificate_arn",
@@ -114,6 +123,28 @@ Creates, updates, deletes or gets a <code>domain_name_v2</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "domain_name_arn",
+    "type": "string",
+    "description": "The amazon resource name (ARN) of the domain name resource."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainnamev2.html"><code>AWS::ApiGateway::DomainNameV2</code></a>.
 
@@ -123,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>domain_name_v2s</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>domain_name_v2s</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>domain_name_v2s</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>domain_name_v2s_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>domain_name_v2s</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>domain_name_v2</code>.
 ```sql
 SELECT
@@ -172,6 +218,19 @@ tags
 FROM awscc.apigateway.domain_name_v2s
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainNameArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>domain_name_v2s</code> in a region.
+```sql
+SELECT
+region,
+domain_name_arn
+FROM awscc.apigateway.domain_name_v2s_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -275,6 +334,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.domain_name_v2s
+SET data__PatchDocument = string('{{ {
+    "CertificateArn": certificate_arn,
+    "Policy": policy,
+    "RoutingMode": routing_mode,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainNameArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/domain_name_v2s_list_only/index.md b/website/docs/services/apigateway/domain_name_v2s_list_only/index.md
deleted file mode 100644
index 0f95b3301..000000000
--- a/website/docs/services/apigateway/domain_name_v2s_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: domain_name_v2s_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - domain_name_v2s_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>domain_name_v2s</code> in a region or regions, for all properties use <a href="/services/apigateway/domain_name_v2s/"><code>domain_name_v2s</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>domain_name_v2s_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ApiGateway::DomainNameV2.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.domain_name_v2s_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "domain_name_arn",
-    "type": "string",
-    "description": "The amazon resource name (ARN) of the domain name resource."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>domain_name_v2s</code> in a region.
-```sql
-SELECT
-region,
-domain_name_arn
-FROM awscc.apigateway.domain_name_v2s_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>domain_name_v2s_list_only</code> resource, see <a href="/services/apigateway/domain_name_v2s/#permissions"><code>domain_name_v2s</code></a>
-
diff --git a/website/docs/services/apigateway/domain_names/index.md b/website/docs/services/apigateway/domain_names/index.md
index 530be3bc5..ae7389019 100644
--- a/website/docs/services/apigateway/domain_names/index.md
+++ b/website/docs/services/apigateway/domain_names/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>domain_name</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain_name",
@@ -151,6 +160,23 @@ Creates, updates, deletes or gets a <code>domain_name</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html"><code>AWS::ApiGateway::DomainName</code></a>.
 
@@ -160,31 +186,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>domain_names</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>domain_names</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>domain_names</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>domain_names_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>domain_names</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -193,6 +225,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>domain_name</code>.
 ```sql
 SELECT
@@ -214,6 +255,19 @@ tags
 FROM awscc.apigateway.domain_names
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>domain_names</code> in a region.
+```sql
+SELECT
+region,
+domain_name
+FROM awscc.apigateway.domain_names_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -331,6 +385,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.domain_names
+SET data__PatchDocument = string('{{ {
+    "EndpointConfiguration": endpoint_configuration,
+    "MutualTlsAuthentication": mutual_tls_authentication,
+    "CertificateArn": certificate_arn,
+    "RegionalCertificateArn": regional_certificate_arn,
+    "OwnershipVerificationCertificateArn": ownership_verification_certificate_arn,
+    "SecurityPolicy": security_policy,
+    "RoutingMode": routing_mode,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/domain_names_list_only/index.md b/website/docs/services/apigateway/domain_names_list_only/index.md
deleted file mode 100644
index a8e28175e..000000000
--- a/website/docs/services/apigateway/domain_names_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: domain_names_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - domain_names_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>domain_names</code> in a region or regions, for all properties use <a href="/services/apigateway/domain_names/"><code>domain_names</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>domain_names_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::DomainName&#96;&#96; resource specifies a custom domain name for your API in API Gateway.<br />You can use a custom domain name to provide a URL that's more intuitive and easier to recall. For more information about using custom domain names, see &#91;Set up Custom Domain Name for an API in API Gateway&#93;(https://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-custom-domains.html) in the &#42;API Gateway Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.domain_names_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>domain_names</code> in a region.
-```sql
-SELECT
-region,
-domain_name
-FROM awscc.apigateway.domain_names_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>domain_names_list_only</code> resource, see <a href="/services/apigateway/domain_names/#permissions"><code>domain_names</code></a>
-
diff --git a/website/docs/services/apigateway/gateway_responses/index.md b/website/docs/services/apigateway/gateway_responses/index.md
index 1428b5d2e..ecc4d32c8 100644
--- a/website/docs/services/apigateway/gateway_responses/index.md
+++ b/website/docs/services/apigateway/gateway_responses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>gateway_response</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -70,6 +79,23 @@ Creates, updates, deletes or gets a <code>gateway_response</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-gatewayresponse.html"><code>AWS::ApiGateway::GatewayResponse</code></a>.
 
@@ -79,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>gateway_responses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResponseType, RestApiId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>gateway_responses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>gateway_responses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>gateway_responses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>gateway_responses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>gateway_response</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ response_templates
 FROM awscc.apigateway.gateway_responses
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>gateway_responses</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.apigateway.gateway_responses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -203,6 +257,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.gateway_responses
+SET data__PatchDocument = string('{{ {
+    "StatusCode": status_code,
+    "ResponseParameters": response_parameters,
+    "ResponseTemplates": response_templates
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/gateway_responses_list_only/index.md b/website/docs/services/apigateway/gateway_responses_list_only/index.md
deleted file mode 100644
index b4e5d4c91..000000000
--- a/website/docs/services/apigateway/gateway_responses_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: gateway_responses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - gateway_responses_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>gateway_responses</code> in a region or regions, for all properties use <a href="/services/apigateway/gateway_responses/"><code>gateway_responses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>gateway_responses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::GatewayResponse&#96;&#96; resource creates a gateway response for your API. For more information, see &#91;API Gateway Responses&#93;(https://docs.aws.amazon.com/apigateway/latest/developerguide/customize-gateway-responses.html#api-gateway-gatewayResponse-definition) in the &#42;API Gateway Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.gateway_responses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>gateway_responses</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.apigateway.gateway_responses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>gateway_responses_list_only</code> resource, see <a href="/services/apigateway/gateway_responses/#permissions"><code>gateway_responses</code></a>
-
diff --git a/website/docs/services/apigateway/index.md b/website/docs/services/apigateway/index.md
index ae067c051..31a9d84ce 100644
--- a/website/docs/services/apigateway/index.md
+++ b/website/docs/services/apigateway/index.md
@@ -20,7 +20,7 @@ The apigateway service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>42</b></span><br />
+<span>total resources:&nbsp;<b>22</b></span><br />
 </div>
 </div>
 
@@ -31,47 +31,27 @@ The apigateway service documentation.
 <div class="providerDocColumn">
 <a href="/services/apigateway/accounts/">accounts</a><br />
 <a href="/services/apigateway/api_keys/">api_keys</a><br />
-<a href="/services/apigateway/api_keys_list_only/">api_keys_list_only</a><br />
 <a href="/services/apigateway/authorizers/">authorizers</a><br />
-<a href="/services/apigateway/authorizers_list_only/">authorizers_list_only</a><br />
 <a href="/services/apigateway/base_path_mapping_v2s/">base_path_mapping_v2s</a><br />
-<a href="/services/apigateway/base_path_mapping_v2s_list_only/">base_path_mapping_v2s_list_only</a><br />
 <a href="/services/apigateway/base_path_mappings/">base_path_mappings</a><br />
-<a href="/services/apigateway/base_path_mappings_list_only/">base_path_mappings_list_only</a><br />
 <a href="/services/apigateway/client_certificates/">client_certificates</a><br />
-<a href="/services/apigateway/client_certificates_list_only/">client_certificates_list_only</a><br />
 <a href="/services/apigateway/deployments/">deployments</a><br />
-<a href="/services/apigateway/deployments_list_only/">deployments_list_only</a><br />
 <a href="/services/apigateway/documentation_parts/">documentation_parts</a><br />
-<a href="/services/apigateway/documentation_parts_list_only/">documentation_parts_list_only</a><br />
 <a href="/services/apigateway/documentation_versions/">documentation_versions</a><br />
-<a href="/services/apigateway/documentation_versions_list_only/">documentation_versions_list_only</a><br />
 <a href="/services/apigateway/domain_name_access_associations/">domain_name_access_associations</a><br />
-<a href="/services/apigateway/domain_name_access_associations_list_only/">domain_name_access_associations_list_only</a><br />
-<a href="/services/apigateway/domain_name_v2s/">domain_name_v2s</a><br />
-<a href="/services/apigateway/domain_name_v2s_list_only/">domain_name_v2s_list_only</a>
+<a href="/services/apigateway/domain_name_v2s/">domain_name_v2s</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/apigateway/domain_names/">domain_names</a><br />
-<a href="/services/apigateway/domain_names_list_only/">domain_names_list_only</a><br />
 <a href="/services/apigateway/gateway_responses/">gateway_responses</a><br />
-<a href="/services/apigateway/gateway_responses_list_only/">gateway_responses_list_only</a><br />
 <a href="/services/apigateway/methods/">methods</a><br />
 <a href="/services/apigateway/models/">models</a><br />
-<a href="/services/apigateway/models_list_only/">models_list_only</a><br />
 <a href="/services/apigateway/request_validators/">request_validators</a><br />
-<a href="/services/apigateway/request_validators_list_only/">request_validators_list_only</a><br />
 <a href="/services/apigateway/resources/">resources</a><br />
-<a href="/services/apigateway/resources_list_only/">resources_list_only</a><br />
 <a href="/services/apigateway/rest_apis/">rest_apis</a><br />
-<a href="/services/apigateway/rest_apis_list_only/">rest_apis_list_only</a><br />
 <a href="/services/apigateway/stages/">stages</a><br />
-<a href="/services/apigateway/stages_list_only/">stages_list_only</a><br />
 <a href="/services/apigateway/usage_plan_keys/">usage_plan_keys</a><br />
-<a href="/services/apigateway/usage_plan_keys_list_only/">usage_plan_keys_list_only</a><br />
 <a href="/services/apigateway/usage_plans/">usage_plans</a><br />
-<a href="/services/apigateway/usage_plans_list_only/">usage_plans_list_only</a><br />
-<a href="/services/apigateway/vpc_links/">vpc_links</a><br />
-<a href="/services/apigateway/vpc_links_list_only/">vpc_links_list_only</a>
+<a href="/services/apigateway/vpc_links/">vpc_links</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/apigateway/methods/index.md b/website/docs/services/apigateway/methods/index.md
index 182285488..3825ab852 100644
--- a/website/docs/services/apigateway/methods/index.md
+++ b/website/docs/services/apigateway/methods/index.md
@@ -414,6 +414,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.methods
+SET data__PatchDocument = string('{{ {
+    "Integration": integration,
+    "OperationName": operation_name,
+    "RequestModels": request_models,
+    "AuthorizationScopes": authorization_scopes,
+    "RequestValidatorId": request_validator_id,
+    "RequestParameters": request_parameters,
+    "MethodResponses": method_responses,
+    "AuthorizerId": authorizer_id,
+    "ApiKeyRequired": api_key_required,
+    "AuthorizationType": authorization_type
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RestApiId>|<ResourceId>|<HttpMethod>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/models/index.md b/website/docs/services/apigateway/models/index.md
index 1608e6db5..158db3893 100644
--- a/website/docs/services/apigateway/models/index.md
+++ b/website/docs/services/apigateway/models/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>model</code> resource or lists <code>m
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "content_type",
@@ -65,6 +74,28 @@ Creates, updates, deletes or gets a <code>model</code> resource or lists <code>m
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "A name for the model. If you don't specify a name, CFN generates a unique physical ID and uses that ID for the model name. For more information, see &#91;Name Type&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-name.html).<br />If you specify a name, you cannot perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name."
+  },
+  {
+    "name": "rest_api_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-model.html"><code>AWS::ApiGateway::Model</code></a>.
 
@@ -74,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>models</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RestApiId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>models</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>models</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>models_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>models</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>model</code>.
 ```sql
 SELECT
@@ -119,6 +165,20 @@ schema
 FROM awscc.apigateway.models
 WHERE region = 'us-east-1' AND data__Identifier = '<RestApiId>|<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>models</code> in a region.
+```sql
+SELECT
+region,
+rest_api_id,
+name
+FROM awscc.apigateway.models_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -195,6 +255,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.models
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Schema": schema
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RestApiId>|<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/models_list_only/index.md b/website/docs/services/apigateway/models_list_only/index.md
deleted file mode 100644
index 45ca8a501..000000000
--- a/website/docs/services/apigateway/models_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: models_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - models_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>models</code> in a region or regions, for all properties use <a href="/services/apigateway/models/"><code>models</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>models_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::Model&#96;&#96; resource defines the structure of a request or response payload for an API method.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.models_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "A name for the model. If you don't specify a name, CFN generates a unique physical ID and uses that ID for the model name. For more information, see &#91;Name Type&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-name.html).<br />If you specify a name, you cannot perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name."
-  },
-  {
-    "name": "rest_api_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>models</code> in a region.
-```sql
-SELECT
-region,
-rest_api_id,
-name
-FROM awscc.apigateway.models_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>models_list_only</code> resource, see <a href="/services/apigateway/models/#permissions"><code>models</code></a>
-
diff --git a/website/docs/services/apigateway/request_validators/index.md b/website/docs/services/apigateway/request_validators/index.md
index a526444dd..95eeb29bf 100644
--- a/website/docs/services/apigateway/request_validators/index.md
+++ b/website/docs/services/apigateway/request_validators/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>request_validator</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "request_validator_id",
@@ -65,6 +74,28 @@ Creates, updates, deletes or gets a <code>request_validator</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "request_validator_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "rest_api_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-requestvalidator.html"><code>AWS::ApiGateway::RequestValidator</code></a>.
 
@@ -74,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>request_validators</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RestApiId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>request_validators</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>request_validators</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>request_validators_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>request_validators</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>request_validator</code>.
 ```sql
 SELECT
@@ -119,6 +165,20 @@ validate_request_parameters
 FROM awscc.apigateway.request_validators
 WHERE region = 'us-east-1' AND data__Identifier = '<RestApiId>|<RequestValidatorId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>request_validators</code> in a region.
+```sql
+SELECT
+region,
+rest_api_id,
+request_validator_id
+FROM awscc.apigateway.request_validators_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -191,6 +251,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.request_validators
+SET data__PatchDocument = string('{{ {
+    "ValidateRequestBody": validate_request_body,
+    "ValidateRequestParameters": validate_request_parameters
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RestApiId>|<RequestValidatorId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/request_validators_list_only/index.md b/website/docs/services/apigateway/request_validators_list_only/index.md
deleted file mode 100644
index 2f97bd4de..000000000
--- a/website/docs/services/apigateway/request_validators_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: request_validators_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - request_validators_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>request_validators</code> in a region or regions, for all properties use <a href="/services/apigateway/request_validators/"><code>request_validators</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>request_validators_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::RequestValidator&#96;&#96; resource sets up basic validation rules for incoming requests to your API. For more information, see &#91;Enable Basic Request Validation for an API in API Gateway&#93;(https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-method-request-validation.html) in the &#42;API Gateway Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.request_validators_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "request_validator_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "rest_api_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>request_validators</code> in a region.
-```sql
-SELECT
-region,
-rest_api_id,
-request_validator_id
-FROM awscc.apigateway.request_validators_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>request_validators_list_only</code> resource, see <a href="/services/apigateway/request_validators/#permissions"><code>request_validators</code></a>
-
diff --git a/website/docs/services/apigateway/resources/index.md b/website/docs/services/apigateway/resources/index.md
index b0d1782c4..09cf9ec98 100644
--- a/website/docs/services/apigateway/resources/index.md
+++ b/website/docs/services/apigateway/resources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "parent_id",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets a <code>resource</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "resource_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "rest_api_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-resource.html"><code>AWS::ApiGateway::Resource</code></a>.
 
@@ -69,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ParentId, PathPart, RestApiId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resources</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource</code>.
 ```sql
 SELECT
@@ -113,6 +159,20 @@ rest_api_id
 FROM awscc.apigateway.resources
 WHERE region = 'us-east-1' AND data__Identifier = '<RestApiId>|<ResourceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resources</code> in a region.
+```sql
+SELECT
+region,
+rest_api_id,
+resource_id
+FROM awscc.apigateway.resources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -185,6 +245,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/resources_list_only/index.md b/website/docs/services/apigateway/resources_list_only/index.md
deleted file mode 100644
index 7f3e73332..000000000
--- a/website/docs/services/apigateway/resources_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: resources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resources_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resources</code> in a region or regions, for all properties use <a href="/services/apigateway/resources/"><code>resources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::Resource&#96;&#96; resource creates a resource in an API.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.resources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "resource_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "rest_api_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resources</code> in a region.
-```sql
-SELECT
-region,
-rest_api_id,
-resource_id
-FROM awscc.apigateway.resources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resources_list_only</code> resource, see <a href="/services/apigateway/resources/#permissions"><code>resources</code></a>
-
diff --git a/website/docs/services/apigateway/rest_apis/index.md b/website/docs/services/apigateway/rest_apis/index.md
index afd36e006..fc5bf5aa3 100644
--- a/website/docs/services/apigateway/rest_apis/index.md
+++ b/website/docs/services/apigateway/rest_apis/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>rest_api</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "policy",
@@ -176,6 +185,23 @@ Creates, updates, deletes or gets a <code>rest_api</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "rest_api_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html"><code>AWS::ApiGateway::RestApi</code></a>.
 
@@ -185,31 +211,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>rest_apis</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>rest_apis</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>rest_apis</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>rest_apis_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>rest_apis</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -218,6 +250,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>rest_api</code>.
 ```sql
 SELECT
@@ -242,6 +283,19 @@ tags
 FROM awscc.apigateway.rest_apis
 WHERE region = 'us-east-1' AND data__Identifier = '<RestApiId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>rest_apis</code> in a region.
+```sql
+SELECT
+region,
+rest_api_id
+FROM awscc.apigateway.rest_apis_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -398,6 +452,33 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.rest_apis
+SET data__PatchDocument = string('{{ {
+    "Policy": policy,
+    "BodyS3Location": body_s3_location,
+    "Description": description,
+    "MinimumCompressionSize": minimum_compression_size,
+    "Parameters": parameters,
+    "CloneFrom": clone_from,
+    "Mode": mode,
+    "DisableExecuteApiEndpoint": disable_execute_api_endpoint,
+    "FailOnWarnings": fail_on_warnings,
+    "BinaryMediaTypes": binary_media_types,
+    "Name": name,
+    "ApiKeySourceType": api_key_source_type,
+    "EndpointConfiguration": endpoint_configuration,
+    "Body": body,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RestApiId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/rest_apis_list_only/index.md b/website/docs/services/apigateway/rest_apis_list_only/index.md
deleted file mode 100644
index f9182a506..000000000
--- a/website/docs/services/apigateway/rest_apis_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: rest_apis_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - rest_apis_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>rest_apis</code> in a region or regions, for all properties use <a href="/services/apigateway/rest_apis/"><code>rest_apis</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>rest_apis_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::RestApi&#96;&#96; resource creates a REST API. For more information, see &#91;restapi:create&#93;(https://docs.aws.amazon.com/apigateway/latest/api/API&#95;CreateRestApi.html) in the &#42;Amazon API Gateway REST API Reference&#42;.<br />On January 1, 2016, the Swagger Specification was donated to the &#91;OpenAPI initiative&#93;(https://docs.aws.amazon.com/https://www.openapis.org/), becoming the foundation of the OpenAPI Specification.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.rest_apis_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "rest_api_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>rest_apis</code> in a region.
-```sql
-SELECT
-region,
-rest_api_id
-FROM awscc.apigateway.rest_apis_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>rest_apis_list_only</code> resource, see <a href="/services/apigateway/rest_apis/#permissions"><code>rest_apis</code></a>
-
diff --git a/website/docs/services/apigateway/stages/index.md b/website/docs/services/apigateway/stages/index.md
index 53843c638..45f32b851 100644
--- a/website/docs/services/apigateway/stages/index.md
+++ b/website/docs/services/apigateway/stages/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>stage</code> resource or lists <code>s
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "access_log_setting",
@@ -208,6 +217,28 @@ Creates, updates, deletes or gets a <code>stage</code> resource or lists <code>s
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "rest_api_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "stage_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html"><code>AWS::ApiGateway::Stage</code></a>.
 
@@ -217,31 +248,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>stages</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RestApiId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>stages</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>stages</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>stages_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>stages</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -250,6 +287,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>stage</code>.
 ```sql
 SELECT
@@ -271,6 +317,20 @@ variables
 FROM awscc.apigateway.stages
 WHERE region = 'us-east-1' AND data__Identifier = '<RestApiId>|<StageName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>stages</code> in a region.
+```sql
+SELECT
+region,
+rest_api_id,
+stage_name
+FROM awscc.apigateway.stages_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -401,6 +461,30 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.stages
+SET data__PatchDocument = string('{{ {
+    "AccessLogSetting": access_log_setting,
+    "CacheClusterEnabled": cache_cluster_enabled,
+    "CacheClusterSize": cache_cluster_size,
+    "CanarySetting": canary_setting,
+    "ClientCertificateId": client_certificate_id,
+    "DeploymentId": deployment_id,
+    "Description": description,
+    "DocumentationVersion": documentation_version,
+    "MethodSettings": method_settings,
+    "Tags": tags,
+    "TracingEnabled": tracing_enabled,
+    "Variables": variables
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RestApiId>|<StageName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/stages_list_only/index.md b/website/docs/services/apigateway/stages_list_only/index.md
deleted file mode 100644
index fd044a7a3..000000000
--- a/website/docs/services/apigateway/stages_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: stages_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - stages_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>stages</code> in a region or regions, for all properties use <a href="/services/apigateway/stages/"><code>stages</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>stages_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::Stage&#96;&#96; resource creates a stage for a deployment.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.stages_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "rest_api_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "stage_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>stages</code> in a region.
-```sql
-SELECT
-region,
-rest_api_id,
-stage_name
-FROM awscc.apigateway.stages_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>stages_list_only</code> resource, see <a href="/services/apigateway/stages/#permissions"><code>stages</code></a>
-
diff --git a/website/docs/services/apigateway/usage_plan_keys/index.md b/website/docs/services/apigateway/usage_plan_keys/index.md
index 0539ec50e..e6febff13 100644
--- a/website/docs/services/apigateway/usage_plan_keys/index.md
+++ b/website/docs/services/apigateway/usage_plan_keys/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>usage_plan_key</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "key_id",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets an <code>usage_plan_key</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplankey.html"><code>AWS::ApiGateway::UsagePlanKey</code></a>.
 
@@ -69,26 +95,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>usage_plan_keys</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="KeyType, UsagePlanId, KeyId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>usage_plan_keys</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>usage_plan_keys_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>usage_plan_keys</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +128,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>usage_plan_key</code>.
 ```sql
 SELECT
@@ -108,6 +148,19 @@ id
 FROM awscc.apigateway.usage_plan_keys
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>usage_plan_keys</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.apigateway.usage_plan_keys_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -180,6 +233,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/usage_plan_keys_list_only/index.md b/website/docs/services/apigateway/usage_plan_keys_list_only/index.md
deleted file mode 100644
index 6252d7b4b..000000000
--- a/website/docs/services/apigateway/usage_plan_keys_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: usage_plan_keys_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - usage_plan_keys_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>usage_plan_keys</code> in a region or regions, for all properties use <a href="/services/apigateway/usage_plan_keys/"><code>usage_plan_keys</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>usage_plan_keys_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::UsagePlanKey&#96;&#96; resource associates an API key with a usage plan. This association determines which users the usage plan is applied to.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.usage_plan_keys_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>usage_plan_keys</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.apigateway.usage_plan_keys_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>usage_plan_keys_list_only</code> resource, see <a href="/services/apigateway/usage_plan_keys/#permissions"><code>usage_plan_keys</code></a>
-
diff --git a/website/docs/services/apigateway/usage_plans/index.md b/website/docs/services/apigateway/usage_plans/index.md
index 2b9115d5c..364cb62b6 100644
--- a/website/docs/services/apigateway/usage_plans/index.md
+++ b/website/docs/services/apigateway/usage_plans/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>usage_plan</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -133,6 +142,23 @@ Creates, updates, deletes or gets an <code>usage_plan</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html"><code>AWS::ApiGateway::UsagePlan</code></a>.
 
@@ -142,31 +168,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>usage_plans</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>usage_plans</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>usage_plans</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>usage_plans_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>usage_plans</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -175,6 +207,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>usage_plan</code>.
 ```sql
 SELECT
@@ -189,6 +230,19 @@ usage_plan_name
 FROM awscc.apigateway.usage_plans
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>usage_plans</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.apigateway.usage_plans_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -289,6 +343,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.usage_plans
+SET data__PatchDocument = string('{{ {
+    "ApiStages": api_stages,
+    "Description": description,
+    "Quota": quota,
+    "Tags": tags,
+    "Throttle": throttle,
+    "UsagePlanName": usage_plan_name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/usage_plans_list_only/index.md b/website/docs/services/apigateway/usage_plans_list_only/index.md
deleted file mode 100644
index f232edc5c..000000000
--- a/website/docs/services/apigateway/usage_plans_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: usage_plans_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - usage_plans_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>usage_plans</code> in a region or regions, for all properties use <a href="/services/apigateway/usage_plans/"><code>usage_plans</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>usage_plans_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::UsagePlan&#96;&#96; resource creates a usage plan for deployed APIs. A usage plan sets a target for the throttling and quota limits on individual client API keys. For more information, see &#91;Creating and Using API Usage Plans in Amazon API Gateway&#93;(https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-api-usage-plans.html) in the &#42;API Gateway Developer Guide&#42;.<br />In some cases clients can exceed the targets that you set. Don’t rely on usage plans to control costs. Consider using &#91;&#93;(https://docs.aws.amazon.com/cost-management/latest/userguide/budgets-managing-costs.html) to monitor costs and &#91;&#93;(https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html) to manage API requests.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.usage_plans_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>usage_plans</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.apigateway.usage_plans_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>usage_plans_list_only</code> resource, see <a href="/services/apigateway/usage_plans/#permissions"><code>usage_plans</code></a>
-
diff --git a/website/docs/services/apigateway/vpc_links/index.md b/website/docs/services/apigateway/vpc_links/index.md
index 17461032f..054da6db7 100644
--- a/website/docs/services/apigateway/vpc_links/index.md
+++ b/website/docs/services/apigateway/vpc_links/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_link</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>vpc_link</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "vpc_link_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-vpclink.html"><code>AWS::ApiGateway::VpcLink</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_links</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, TargetArns, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_links</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_links</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_links_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_links</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_link</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ vpc_link_id
 FROM awscc.apigateway.vpc_links
 WHERE region = 'us-east-1' AND data__Identifier = '<VpcLinkId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_links</code> in a region.
+```sql
+SELECT
+region,
+vpc_link_id
+FROM awscc.apigateway.vpc_links_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -208,6 +262,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigateway.vpc_links
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<VpcLinkId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigateway/vpc_links_list_only/index.md b/website/docs/services/apigateway/vpc_links_list_only/index.md
deleted file mode 100644
index ab23a01f4..000000000
--- a/website/docs/services/apigateway/vpc_links_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpc_links_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_links_list_only
-  - apigateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_links</code> in a region or regions, for all properties use <a href="/services/apigateway/vpc_links/"><code>vpc_links</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_links_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGateway::VpcLink&#96;&#96; resource creates an API Gateway VPC link for a REST API to access resources in an Amazon Virtual Private Cloud (VPC). For more information, see &#91;vpclink:create&#93;(https://docs.aws.amazon.com/apigateway/latest/api/API&#95;CreateVpcLink.html) in the &#96;&#96;Amazon API Gateway REST API Reference&#96;&#96;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigateway.vpc_links_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "vpc_link_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_links</code> in a region.
-```sql
-SELECT
-region,
-vpc_link_id
-FROM awscc.apigateway.vpc_links_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_links_list_only</code> resource, see <a href="/services/apigateway/vpc_links/#permissions"><code>vpc_links</code></a>
-
diff --git a/website/docs/services/apigatewayv2/api_mappings/index.md b/website/docs/services/apigatewayv2/api_mappings/index.md
index d0689f2b0..29f8052e5 100644
--- a/website/docs/services/apigatewayv2/api_mappings/index.md
+++ b/website/docs/services/apigatewayv2/api_mappings/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>api_mapping</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "api_mapping_id",
@@ -65,6 +74,28 @@ Creates, updates, deletes or gets an <code>api_mapping</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "api_mapping_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "domain_name",
+    "type": "string",
+    "description": "The domain name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apimapping.html"><code>AWS::ApiGatewayV2::ApiMapping</code></a>.
 
@@ -74,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>api_mappings</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainName, Stage, ApiId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>api_mappings</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>api_mappings</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>api_mappings_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>api_mappings</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>api_mapping</code>.
 ```sql
 SELECT
@@ -119,6 +165,20 @@ api_id
 FROM awscc.apigatewayv2.api_mappings
 WHERE region = 'us-east-1' AND data__Identifier = '<ApiMappingId>|<DomainName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>api_mappings</code> in a region.
+```sql
+SELECT
+region,
+api_mapping_id,
+domain_name
+FROM awscc.apigatewayv2.api_mappings_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -195,6 +255,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigatewayv2.api_mappings
+SET data__PatchDocument = string('{{ {
+    "Stage": stage,
+    "ApiMappingKey": api_mapping_key,
+    "ApiId": api_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApiMappingId>|<DomainName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigatewayv2/api_mappings_list_only/index.md b/website/docs/services/apigatewayv2/api_mappings_list_only/index.md
deleted file mode 100644
index e76bcf576..000000000
--- a/website/docs/services/apigatewayv2/api_mappings_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: api_mappings_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - api_mappings_list_only
-  - apigatewayv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>api_mappings</code> in a region or regions, for all properties use <a href="/services/apigatewayv2/api_mappings/"><code>api_mappings</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>api_mappings_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGatewayV2::ApiMapping&#96;&#96; resource contains an API mapping. An API mapping relates a path of your custom domain name to a stage of your API. A custom domain name can have multiple API mappings, but the paths can't overlap. A custom domain can map only to APIs of the same protocol type. For more information, see &#91;CreateApiMapping&#93;(https://docs.aws.amazon.com/apigatewayv2/latest/api-reference/domainnames-domainname-apimappings.html#CreateApiMapping) in the &#42;Amazon API Gateway V2 API Reference&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigatewayv2.api_mappings_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "api_mapping_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "domain_name",
-    "type": "string",
-    "description": "The domain name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>api_mappings</code> in a region.
-```sql
-SELECT
-region,
-api_mapping_id,
-domain_name
-FROM awscc.apigatewayv2.api_mappings_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>api_mappings_list_only</code> resource, see <a href="/services/apigatewayv2/api_mappings/#permissions"><code>api_mappings</code></a>
-
diff --git a/website/docs/services/apigatewayv2/apis/index.md b/website/docs/services/apigatewayv2/apis/index.md
index 1c3a4847b..75ee68c42 100644
--- a/website/docs/services/apigatewayv2/apis/index.md
+++ b/website/docs/services/apigatewayv2/apis/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>api</code> resource or lists <code>ap
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "route_selection_expression",
@@ -194,6 +203,23 @@ Creates, updates, deletes or gets an <code>api</code> resource or lists <code>ap
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "api_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html"><code>AWS::ApiGatewayV2::Api</code></a>.
 
@@ -203,31 +229,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>apis</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>apis</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>apis</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>apis_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>apis</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -236,6 +268,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>api</code>.
 ```sql
 SELECT
@@ -263,6 +304,19 @@ ip_address_type
 FROM awscc.apigatewayv2.apis
 WHERE region = 'us-east-1' AND data__Identifier = '<ApiId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>apis</code> in a region.
+```sql
+SELECT
+region,
+api_id
+FROM awscc.apigatewayv2.apis_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -439,6 +493,35 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigatewayv2.apis
+SET data__PatchDocument = string('{{ {
+    "RouteSelectionExpression": route_selection_expression,
+    "Body": body,
+    "BodyS3Location": body_s3_location,
+    "BasePath": base_path,
+    "CredentialsArn": credentials_arn,
+    "CorsConfiguration": cors_configuration,
+    "RouteKey": route_key,
+    "Target": target,
+    "FailOnWarnings": fail_on_warnings,
+    "Description": description,
+    "DisableExecuteApiEndpoint": disable_execute_api_endpoint,
+    "DisableSchemaValidation": disable_schema_validation,
+    "Name": name,
+    "Version": version,
+    "Tags": tags,
+    "ApiKeySelectionExpression": api_key_selection_expression,
+    "IpAddressType": ip_address_type
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApiId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigatewayv2/apis_list_only/index.md b/website/docs/services/apigatewayv2/apis_list_only/index.md
deleted file mode 100644
index b9f74a45a..000000000
--- a/website/docs/services/apigatewayv2/apis_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: apis_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - apis_list_only
-  - apigatewayv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>apis</code> in a region or regions, for all properties use <a href="/services/apigatewayv2/apis/"><code>apis</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>apis_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGatewayV2::Api&#96;&#96; resource creates an API. WebSocket APIs and HTTP APIs are supported. For more information about WebSocket APIs, see &#91;About WebSocket APIs in API Gateway&#93;(https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-overview.html) in the &#42;API Gateway Developer Guide&#42;. For more information about HTTP APIs, see &#91;HTTP APIs&#93;(https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api.html) in the &#42;API Gateway Developer Guide.&#42;</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigatewayv2.apis_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "api_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>apis</code> in a region.
-```sql
-SELECT
-region,
-api_id
-FROM awscc.apigatewayv2.apis_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>apis_list_only</code> resource, see <a href="/services/apigatewayv2/apis/#permissions"><code>apis</code></a>
-
diff --git a/website/docs/services/apigatewayv2/authorizers/index.md b/website/docs/services/apigatewayv2/authorizers/index.md
index e051bbf0b..4a69287cf 100644
--- a/website/docs/services/apigatewayv2/authorizers/index.md
+++ b/website/docs/services/apigatewayv2/authorizers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>authorizer</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "identity_validation_expression",
@@ -112,6 +121,28 @@ Creates, updates, deletes or gets an <code>authorizer</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "api_id",
+    "type": "string",
+    "description": "The API identifier."
+  },
+  {
+    "name": "authorizer_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-authorizer.html"><code>AWS::ApiGatewayV2::Authorizer</code></a>.
 
@@ -121,31 +152,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>authorizers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AuthorizerType, ApiId, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>authorizers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>authorizers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>authorizers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>authorizers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -154,6 +191,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>authorizer</code>.
 ```sql
 SELECT
@@ -173,6 +219,20 @@ name
 FROM awscc.apigatewayv2.authorizers
 WHERE region = 'us-east-1' AND data__Identifier = '<AuthorizerId>|<ApiId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>authorizers</code> in a region.
+```sql
+SELECT
+region,
+authorizer_id,
+api_id
+FROM awscc.apigatewayv2.authorizers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -281,6 +341,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigatewayv2.authorizers
+SET data__PatchDocument = string('{{ {
+    "IdentityValidationExpression": identity_validation_expression,
+    "AuthorizerUri": authorizer_uri,
+    "AuthorizerCredentialsArn": authorizer_credentials_arn,
+    "AuthorizerType": authorizer_type,
+    "IdentitySource": identity_source,
+    "JwtConfiguration": jwt_configuration,
+    "AuthorizerResultTtlInSeconds": authorizer_result_ttl_in_seconds,
+    "AuthorizerPayloadFormatVersion": authorizer_payload_format_version,
+    "EnableSimpleResponses": enable_simple_responses,
+    "Name": name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AuthorizerId>|<ApiId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigatewayv2/authorizers_list_only/index.md b/website/docs/services/apigatewayv2/authorizers_list_only/index.md
deleted file mode 100644
index 445c8f0ab..000000000
--- a/website/docs/services/apigatewayv2/authorizers_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: authorizers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - authorizers_list_only
-  - apigatewayv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>authorizers</code> in a region or regions, for all properties use <a href="/services/apigatewayv2/authorizers/"><code>authorizers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>authorizers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGatewayV2::Authorizer&#96;&#96; resource creates an authorizer for a WebSocket API or an HTTP API. To learn more, see &#91;Controlling and managing access to a WebSocket API in API Gateway&#93;(https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-control-access.html) and &#91;Controlling and managing access to an HTTP API in API Gateway&#93;(https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-access-control.html) in the &#42;API Gateway Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigatewayv2.authorizers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "api_id",
-    "type": "string",
-    "description": "The API identifier."
-  },
-  {
-    "name": "authorizer_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>authorizers</code> in a region.
-```sql
-SELECT
-region,
-authorizer_id,
-api_id
-FROM awscc.apigatewayv2.authorizers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>authorizers_list_only</code> resource, see <a href="/services/apigatewayv2/authorizers/#permissions"><code>authorizers</code></a>
-
diff --git a/website/docs/services/apigatewayv2/deployments/index.md b/website/docs/services/apigatewayv2/deployments/index.md
index bcd7353f4..373213893 100644
--- a/website/docs/services/apigatewayv2/deployments/index.md
+++ b/website/docs/services/apigatewayv2/deployments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "deployment_id",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "deployment_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "api_id",
+    "type": "string",
+    "description": "The API identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-deployment.html"><code>AWS::ApiGatewayV2::Deployment</code></a>.
 
@@ -69,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApiId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>deployments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>deployment</code>.
 ```sql
 SELECT
@@ -113,6 +159,20 @@ api_id
 FROM awscc.apigatewayv2.deployments
 WHERE region = 'us-east-1' AND data__Identifier = '<ApiId>|<DeploymentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>deployments</code> in a region.
+```sql
+SELECT
+region,
+api_id,
+deployment_id
+FROM awscc.apigatewayv2.deployments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -181,6 +241,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigatewayv2.deployments
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "StageName": stage_name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApiId>|<DeploymentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigatewayv2/deployments_list_only/index.md b/website/docs/services/apigatewayv2/deployments_list_only/index.md
deleted file mode 100644
index 3a3936891..000000000
--- a/website/docs/services/apigatewayv2/deployments_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: deployments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - deployments_list_only
-  - apigatewayv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>deployments</code> in a region or regions, for all properties use <a href="/services/apigatewayv2/deployments/"><code>deployments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>deployments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGatewayV2::Deployment&#96;&#96; resource creates a deployment for an API.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigatewayv2.deployments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "deployment_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "api_id",
-    "type": "string",
-    "description": "The API identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>deployments</code> in a region.
-```sql
-SELECT
-region,
-api_id,
-deployment_id
-FROM awscc.apigatewayv2.deployments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>deployments_list_only</code> resource, see <a href="/services/apigatewayv2/deployments/#permissions"><code>deployments</code></a>
-
diff --git a/website/docs/services/apigatewayv2/domain_names/index.md b/website/docs/services/apigatewayv2/domain_names/index.md
index 02155dc2e..2d4ce2edd 100644
--- a/website/docs/services/apigatewayv2/domain_names/index.md
+++ b/website/docs/services/apigatewayv2/domain_names/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>domain_name</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "mutual_tls_authentication",
@@ -124,6 +133,23 @@ Creates, updates, deletes or gets a <code>domain_name</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_name",
+    "type": "string",
+    "description": "The custom domain name for your API in Amazon API Gateway. Uppercase letters and the underscore (&#96;&#96;&#95;&#96;&#96;) character are not supported."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-domainname.html"><code>AWS::ApiGatewayV2::DomainName</code></a>.
 
@@ -133,31 +159,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>domain_names</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>domain_names</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>domain_names</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>domain_names_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>domain_names</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -166,6 +198,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>domain_name</code>.
 ```sql
 SELECT
@@ -181,6 +222,19 @@ tags
 FROM awscc.apigatewayv2.domain_names
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>domain_names</code> in a region.
+```sql
+SELECT
+region,
+domain_name
+FROM awscc.apigatewayv2.domain_names_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -265,6 +319,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigatewayv2.domain_names
+SET data__PatchDocument = string('{{ {
+    "MutualTlsAuthentication": mutual_tls_authentication,
+    "DomainNameConfigurations": domain_name_configurations,
+    "RoutingMode": routing_mode,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigatewayv2/domain_names_list_only/index.md b/website/docs/services/apigatewayv2/domain_names_list_only/index.md
deleted file mode 100644
index f3480757c..000000000
--- a/website/docs/services/apigatewayv2/domain_names_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: domain_names_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - domain_names_list_only
-  - apigatewayv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>domain_names</code> in a region or regions, for all properties use <a href="/services/apigatewayv2/domain_names/"><code>domain_names</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>domain_names_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGatewayV2::DomainName&#96;&#96; resource specifies a custom domain name for your API in Amazon API Gateway (API Gateway). <br />You can use a custom domain name to provide a URL that's more intuitive and easier to recall. For more information about using custom domain names, see &#91;Set up Custom Domain Name for an API in API Gateway&#93;(https://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-custom-domains.html) in the &#42;API Gateway Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigatewayv2.domain_names_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_name",
-    "type": "string",
-    "description": "The custom domain name for your API in Amazon API Gateway. Uppercase letters and the underscore (&#96;&#96;&#95;&#96;&#96;) character are not supported."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>domain_names</code> in a region.
-```sql
-SELECT
-region,
-domain_name
-FROM awscc.apigatewayv2.domain_names_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>domain_names_list_only</code> resource, see <a href="/services/apigatewayv2/domain_names/#permissions"><code>domain_names</code></a>
-
diff --git a/website/docs/services/apigatewayv2/index.md b/website/docs/services/apigatewayv2/index.md
index 12a69ba96..65cdcb46f 100644
--- a/website/docs/services/apigatewayv2/index.md
+++ b/website/docs/services/apigatewayv2/index.md
@@ -20,7 +20,7 @@ The apigatewayv2 service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>24</b></span><br />
+<span>total resources:&nbsp;<b>12</b></span><br />
 </div>
 </div>
 
@@ -30,30 +30,18 @@ The apigatewayv2 service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/apigatewayv2/api_mappings/">api_mappings</a><br />
-<a href="/services/apigatewayv2/api_mappings_list_only/">api_mappings_list_only</a><br />
 <a href="/services/apigatewayv2/apis/">apis</a><br />
-<a href="/services/apigatewayv2/apis_list_only/">apis_list_only</a><br />
 <a href="/services/apigatewayv2/authorizers/">authorizers</a><br />
-<a href="/services/apigatewayv2/authorizers_list_only/">authorizers_list_only</a><br />
 <a href="/services/apigatewayv2/deployments/">deployments</a><br />
-<a href="/services/apigatewayv2/deployments_list_only/">deployments_list_only</a><br />
 <a href="/services/apigatewayv2/domain_names/">domain_names</a><br />
-<a href="/services/apigatewayv2/domain_names_list_only/">domain_names_list_only</a><br />
-<a href="/services/apigatewayv2/integration_responses/">integration_responses</a><br />
-<a href="/services/apigatewayv2/integration_responses_list_only/">integration_responses_list_only</a>
+<a href="/services/apigatewayv2/integration_responses/">integration_responses</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/apigatewayv2/integrations/">integrations</a><br />
-<a href="/services/apigatewayv2/integrations_list_only/">integrations_list_only</a><br />
 <a href="/services/apigatewayv2/models/">models</a><br />
-<a href="/services/apigatewayv2/models_list_only/">models_list_only</a><br />
 <a href="/services/apigatewayv2/route_responses/">route_responses</a><br />
-<a href="/services/apigatewayv2/route_responses_list_only/">route_responses_list_only</a><br />
 <a href="/services/apigatewayv2/routes/">routes</a><br />
-<a href="/services/apigatewayv2/routes_list_only/">routes_list_only</a><br />
 <a href="/services/apigatewayv2/routing_rules/">routing_rules</a><br />
-<a href="/services/apigatewayv2/routing_rules_list_only/">routing_rules_list_only</a><br />
-<a href="/services/apigatewayv2/vpc_links/">vpc_links</a><br />
-<a href="/services/apigatewayv2/vpc_links_list_only/">vpc_links_list_only</a>
+<a href="/services/apigatewayv2/vpc_links/">vpc_links</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/apigatewayv2/integration_responses/index.md b/website/docs/services/apigatewayv2/integration_responses/index.md
index 09b321b1e..95e1dc3f9 100644
--- a/website/docs/services/apigatewayv2/integration_responses/index.md
+++ b/website/docs/services/apigatewayv2/integration_responses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>integration_response</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "integration_response_id",
@@ -80,6 +89,33 @@ Creates, updates, deletes or gets an <code>integration_response</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "integration_response_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "integration_id",
+    "type": "string",
+    "description": "The integration ID."
+  },
+  {
+    "name": "api_id",
+    "type": "string",
+    "description": "The API identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integrationresponse.html"><code>AWS::ApiGatewayV2::IntegrationResponse</code></a>.
 
@@ -89,31 +125,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>integration_responses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApiId, IntegrationId, IntegrationResponseKey, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>integration_responses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>integration_responses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>integration_responses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>integration_responses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -122,6 +164,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>integration_response</code>.
 ```sql
 SELECT
@@ -137,6 +188,21 @@ api_id
 FROM awscc.apigatewayv2.integration_responses
 WHERE region = 'us-east-1' AND data__Identifier = '<ApiId>|<IntegrationId>|<IntegrationResponseId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>integration_responses</code> in a region.
+```sql
+SELECT
+region,
+api_id,
+integration_id,
+integration_response_id
+FROM awscc.apigatewayv2.integration_responses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -225,6 +291,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigatewayv2.integration_responses
+SET data__PatchDocument = string('{{ {
+    "ResponseTemplates": response_templates,
+    "TemplateSelectionExpression": template_selection_expression,
+    "ResponseParameters": response_parameters,
+    "ContentHandlingStrategy": content_handling_strategy,
+    "IntegrationResponseKey": integration_response_key
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApiId>|<IntegrationId>|<IntegrationResponseId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigatewayv2/integration_responses_list_only/index.md b/website/docs/services/apigatewayv2/integration_responses_list_only/index.md
deleted file mode 100644
index 96c903ee5..000000000
--- a/website/docs/services/apigatewayv2/integration_responses_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: integration_responses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - integration_responses_list_only
-  - apigatewayv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>integration_responses</code> in a region or regions, for all properties use <a href="/services/apigatewayv2/integration_responses/"><code>integration_responses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>integration_responses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGatewayV2::IntegrationResponse&#96;&#96; resource updates an integration response for an WebSocket API. For more information, see &#91;Set up WebSocket API Integration Responses in API Gateway&#93;(https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-integration-responses.html) in the &#42;API Gateway Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigatewayv2.integration_responses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "integration_response_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "integration_id",
-    "type": "string",
-    "description": "The integration ID."
-  },
-  {
-    "name": "api_id",
-    "type": "string",
-    "description": "The API identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>integration_responses</code> in a region.
-```sql
-SELECT
-region,
-api_id,
-integration_id,
-integration_response_id
-FROM awscc.apigatewayv2.integration_responses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>integration_responses_list_only</code> resource, see <a href="/services/apigatewayv2/integration_responses/#permissions"><code>integration_responses</code></a>
-
diff --git a/website/docs/services/apigatewayv2/integrations/index.md b/website/docs/services/apigatewayv2/integrations/index.md
index d8ad88850..c02994ca1 100644
--- a/website/docs/services/apigatewayv2/integrations/index.md
+++ b/website/docs/services/apigatewayv2/integrations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>integration</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "api_id",
@@ -142,6 +151,28 @@ Creates, updates, deletes or gets an <code>integration</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "api_id",
+    "type": "string",
+    "description": "The API identifier."
+  },
+  {
+    "name": "integration_id",
+    "type": "string",
+    "description": "The integration ID."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html"><code>AWS::ApiGatewayV2::Integration</code></a>.
 
@@ -151,31 +182,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApiId, IntegrationType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>integrations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -184,6 +221,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>integration</code>.
 ```sql
 SELECT
@@ -210,6 +256,20 @@ tls_config
 FROM awscc.apigatewayv2.integrations
 WHERE region = 'us-east-1' AND data__Identifier = '<ApiId>|<IntegrationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>integrations</code> in a region.
+```sql
+SELECT
+region,
+api_id,
+integration_id
+FROM awscc.apigatewayv2.integrations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -341,6 +401,35 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigatewayv2.integrations
+SET data__PatchDocument = string('{{ {
+    "ConnectionId": connection_id,
+    "ConnectionType": connection_type,
+    "ContentHandlingStrategy": content_handling_strategy,
+    "CredentialsArn": credentials_arn,
+    "Description": description,
+    "IntegrationMethod": integration_method,
+    "IntegrationSubtype": integration_subtype,
+    "IntegrationType": integration_type,
+    "IntegrationUri": integration_uri,
+    "PassthroughBehavior": passthrough_behavior,
+    "PayloadFormatVersion": payload_format_version,
+    "RequestParameters": request_parameters,
+    "RequestTemplates": request_templates,
+    "ResponseParameters": response_parameters,
+    "TemplateSelectionExpression": template_selection_expression,
+    "TimeoutInMillis": timeout_in_millis,
+    "TlsConfig": tls_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApiId>|<IntegrationId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigatewayv2/integrations_list_only/index.md b/website/docs/services/apigatewayv2/integrations_list_only/index.md
deleted file mode 100644
index 451740bcc..000000000
--- a/website/docs/services/apigatewayv2/integrations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: integrations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - integrations_list_only
-  - apigatewayv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>integrations</code> in a region or regions, for all properties use <a href="/services/apigatewayv2/integrations/"><code>integrations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>integrations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An example resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigatewayv2.integrations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "api_id",
-    "type": "string",
-    "description": "The API identifier."
-  },
-  {
-    "name": "integration_id",
-    "type": "string",
-    "description": "The integration ID."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>integrations</code> in a region.
-```sql
-SELECT
-region,
-api_id,
-integration_id
-FROM awscc.apigatewayv2.integrations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>integrations_list_only</code> resource, see <a href="/services/apigatewayv2/integrations/#permissions"><code>integrations</code></a>
-
diff --git a/website/docs/services/apigatewayv2/models/index.md b/website/docs/services/apigatewayv2/models/index.md
index 79a7f8631..b5b854df1 100644
--- a/website/docs/services/apigatewayv2/models/index.md
+++ b/website/docs/services/apigatewayv2/models/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>model</code> resource or lists <code>m
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "model_id",
@@ -70,6 +79,28 @@ Creates, updates, deletes or gets a <code>model</code> resource or lists <code>m
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "model_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "api_id",
+    "type": "string",
+    "description": "The API identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-model.html"><code>AWS::ApiGatewayV2::Model</code></a>.
 
@@ -79,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>models</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApiId, Schema, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>models</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>models</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>models_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>models</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>model</code>.
 ```sql
 SELECT
@@ -125,6 +171,20 @@ name
 FROM awscc.apigatewayv2.models
 WHERE region = 'us-east-1' AND data__Identifier = '<ApiId>|<ModelId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>models</code> in a region.
+```sql
+SELECT
+region,
+api_id,
+model_id
+FROM awscc.apigatewayv2.models_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +265,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigatewayv2.models
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "ContentType": content_type,
+    "Schema": schema,
+    "Name": name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApiId>|<ModelId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigatewayv2/models_list_only/index.md b/website/docs/services/apigatewayv2/models_list_only/index.md
deleted file mode 100644
index dfc57a482..000000000
--- a/website/docs/services/apigatewayv2/models_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: models_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - models_list_only
-  - apigatewayv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>models</code> in a region or regions, for all properties use <a href="/services/apigatewayv2/models/"><code>models</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>models_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGatewayV2::Model&#96;&#96; resource updates data model for a WebSocket API. For more information, see &#91;Model Selection Expressions&#93;(https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-model-selection-expressions) in the &#42;API Gateway Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigatewayv2.models_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "model_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "api_id",
-    "type": "string",
-    "description": "The API identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>models</code> in a region.
-```sql
-SELECT
-region,
-api_id,
-model_id
-FROM awscc.apigatewayv2.models_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>models_list_only</code> resource, see <a href="/services/apigatewayv2/models/#permissions"><code>models</code></a>
-
diff --git a/website/docs/services/apigatewayv2/route_responses/index.md b/website/docs/services/apigatewayv2/route_responses/index.md
index 7f5f6530b..2083d7da8 100644
--- a/website/docs/services/apigatewayv2/route_responses/index.md
+++ b/website/docs/services/apigatewayv2/route_responses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>route_response</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "route_response_key",
@@ -75,6 +84,33 @@ Creates, updates, deletes or gets a <code>route_response</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "route_id",
+    "type": "string",
+    "description": "The route ID."
+  },
+  {
+    "name": "api_id",
+    "type": "string",
+    "description": "The API identifier."
+  },
+  {
+    "name": "route_response_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-routeresponse.html"><code>AWS::ApiGatewayV2::RouteResponse</code></a>.
 
@@ -84,31 +120,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>route_responses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RouteResponseKey, RouteId, ApiId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>route_responses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>route_responses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>route_responses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>route_responses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +159,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>route_response</code>.
 ```sql
 SELECT
@@ -131,6 +182,21 @@ route_response_id
 FROM awscc.apigatewayv2.route_responses
 WHERE region = 'us-east-1' AND data__Identifier = '<ApiId>|<RouteId>|<RouteResponseId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>route_responses</code> in a region.
+```sql
+SELECT
+region,
+api_id,
+route_id,
+route_response_id
+FROM awscc.apigatewayv2.route_responses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -215,6 +281,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigatewayv2.route_responses
+SET data__PatchDocument = string('{{ {
+    "RouteResponseKey": route_response_key,
+    "ResponseParameters": response_parameters,
+    "ModelSelectionExpression": model_selection_expression,
+    "ResponseModels": response_models
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApiId>|<RouteId>|<RouteResponseId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigatewayv2/route_responses_list_only/index.md b/website/docs/services/apigatewayv2/route_responses_list_only/index.md
deleted file mode 100644
index 2c3741fc6..000000000
--- a/website/docs/services/apigatewayv2/route_responses_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: route_responses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - route_responses_list_only
-  - apigatewayv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>route_responses</code> in a region or regions, for all properties use <a href="/services/apigatewayv2/route_responses/"><code>route_responses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>route_responses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGatewayV2::RouteResponse&#96;&#96; resource creates a route response for a WebSocket API. For more information, see &#91;Set up Route Responses for a WebSocket API in API Gateway&#93;(https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-route-response.html) in the &#42;API Gateway Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigatewayv2.route_responses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "route_id",
-    "type": "string",
-    "description": "The route ID."
-  },
-  {
-    "name": "api_id",
-    "type": "string",
-    "description": "The API identifier."
-  },
-  {
-    "name": "route_response_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>route_responses</code> in a region.
-```sql
-SELECT
-region,
-api_id,
-route_id,
-route_response_id
-FROM awscc.apigatewayv2.route_responses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>route_responses_list_only</code> resource, see <a href="/services/apigatewayv2/route_responses/#permissions"><code>route_responses</code></a>
-
diff --git a/website/docs/services/apigatewayv2/routes/index.md b/website/docs/services/apigatewayv2/routes/index.md
index bd243c330..03792bd5c 100644
--- a/website/docs/services/apigatewayv2/routes/index.md
+++ b/website/docs/services/apigatewayv2/routes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>route</code> resource or lists <code>r
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "route_id",
@@ -105,6 +114,28 @@ Creates, updates, deletes or gets a <code>route</code> resource or lists <code>r
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "route_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "api_id",
+    "type": "string",
+    "description": "The API identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-route.html"><code>AWS::ApiGatewayV2::Route</code></a>.
 
@@ -114,31 +145,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>routes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RouteKey, ApiId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>routes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>routes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>routes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>routes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -147,6 +184,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>route</code>.
 ```sql
 SELECT
@@ -167,6 +213,20 @@ authorizer_id
 FROM awscc.apigatewayv2.routes
 WHERE region = 'us-east-1' AND data__Identifier = '<ApiId>|<RouteId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>routes</code> in a region.
+```sql
+SELECT
+region,
+api_id,
+route_id
+FROM awscc.apigatewayv2.routes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -274,6 +334,29 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigatewayv2.routes
+SET data__PatchDocument = string('{{ {
+    "RouteResponseSelectionExpression": route_response_selection_expression,
+    "RequestModels": request_models,
+    "OperationName": operation_name,
+    "AuthorizationScopes": authorization_scopes,
+    "ApiKeyRequired": api_key_required,
+    "RouteKey": route_key,
+    "AuthorizationType": authorization_type,
+    "ModelSelectionExpression": model_selection_expression,
+    "RequestParameters": request_parameters,
+    "Target": target,
+    "AuthorizerId": authorizer_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApiId>|<RouteId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigatewayv2/routes_list_only/index.md b/website/docs/services/apigatewayv2/routes_list_only/index.md
deleted file mode 100644
index 9ba87f11e..000000000
--- a/website/docs/services/apigatewayv2/routes_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: routes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - routes_list_only
-  - apigatewayv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>routes</code> in a region or regions, for all properties use <a href="/services/apigatewayv2/routes/"><code>routes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>routes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGatewayV2::Route&#96;&#96; resource creates a route for an API.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigatewayv2.routes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "route_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "api_id",
-    "type": "string",
-    "description": "The API identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>routes</code> in a region.
-```sql
-SELECT
-region,
-api_id,
-route_id
-FROM awscc.apigatewayv2.routes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>routes_list_only</code> resource, see <a href="/services/apigatewayv2/routes/#permissions"><code>routes</code></a>
-
diff --git a/website/docs/services/apigatewayv2/routing_rules/index.md b/website/docs/services/apigatewayv2/routing_rules/index.md
index 114a8b41b..e7f2f154f 100644
--- a/website/docs/services/apigatewayv2/routing_rules/index.md
+++ b/website/docs/services/apigatewayv2/routing_rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>routing_rule</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "routing_rule_id",
@@ -132,6 +141,23 @@ Creates, updates, deletes or gets a <code>routing_rule</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "routing_rule_arn",
+    "type": "string",
+    "description": "Amazon Resource Name (ARN) of the resource."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-routingrule.html"><code>AWS::ApiGatewayV2::RoutingRule</code></a>.
 
@@ -141,31 +167,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>routing_rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainNameArn, Priority, Conditions, Actions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>routing_rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>routing_rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>routing_rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>routing_rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -174,6 +206,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>routing_rule</code>.
 ```sql
 SELECT
@@ -187,6 +228,19 @@ actions
 FROM awscc.apigatewayv2.routing_rules
 WHERE region = 'us-east-1' AND data__Identifier = '<RoutingRuleArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>routing_rules</code> in a region.
+```sql
+SELECT
+region,
+routing_rule_arn
+FROM awscc.apigatewayv2.routing_rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -276,6 +330,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigatewayv2.routing_rules
+SET data__PatchDocument = string('{{ {
+    "Priority": priority,
+    "Conditions": conditions,
+    "Actions": actions
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RoutingRuleArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigatewayv2/routing_rules_list_only/index.md b/website/docs/services/apigatewayv2/routing_rules_list_only/index.md
deleted file mode 100644
index 616b849ef..000000000
--- a/website/docs/services/apigatewayv2/routing_rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: routing_rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - routing_rules_list_only
-  - apigatewayv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>routing_rules</code> in a region or regions, for all properties use <a href="/services/apigatewayv2/routing_rules/"><code>routing_rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>routing_rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Schema for AWS::ApiGatewayV2::RoutingRule</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigatewayv2.routing_rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "routing_rule_arn",
-    "type": "string",
-    "description": "Amazon Resource Name (ARN) of the resource."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>routing_rules</code> in a region.
-```sql
-SELECT
-region,
-routing_rule_arn
-FROM awscc.apigatewayv2.routing_rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>routing_rules_list_only</code> resource, see <a href="/services/apigatewayv2/routing_rules/#permissions"><code>routing_rules</code></a>
-
diff --git a/website/docs/services/apigatewayv2/vpc_links/index.md b/website/docs/services/apigatewayv2/vpc_links/index.md
index e113f20d9..b8bbb51af 100644
--- a/website/docs/services/apigatewayv2/vpc_links/index.md
+++ b/website/docs/services/apigatewayv2/vpc_links/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_link</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "vpc_link_id",
@@ -65,6 +74,23 @@ Creates, updates, deletes or gets a <code>vpc_link</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "vpc_link_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-vpclink.html"><code>AWS::ApiGatewayV2::VpcLink</code></a>.
 
@@ -74,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_links</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SubnetIds, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_links</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_links</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_links_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_links</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_link</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ name
 FROM awscc.apigatewayv2.vpc_links
 WHERE region = 'us-east-1' AND data__Identifier = '<VpcLinkId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_links</code> in a region.
+```sql
+SELECT
+region,
+vpc_link_id
+FROM awscc.apigatewayv2.vpc_links_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -195,6 +249,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apigatewayv2.vpc_links
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Name": name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<VpcLinkId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apigatewayv2/vpc_links_list_only/index.md b/website/docs/services/apigatewayv2/vpc_links_list_only/index.md
deleted file mode 100644
index 76d6e63ea..000000000
--- a/website/docs/services/apigatewayv2/vpc_links_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpc_links_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_links_list_only
-  - apigatewayv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_links</code> in a region or regions, for all properties use <a href="/services/apigatewayv2/vpc_links/"><code>vpc_links</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_links_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApiGatewayV2::VpcLink&#96;&#96; resource creates a VPC link. Supported only for HTTP APIs. The VPC link status must transition from &#96;&#96;PENDING&#96;&#96; to &#96;&#96;AVAILABLE&#96;&#96; to successfully create a VPC link, which can take up to 10 minutes. To learn more, see &#91;Working with VPC Links for HTTP APIs&#93;(https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-vpc-links.html) in the &#42;API Gateway Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apigatewayv2.vpc_links_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "vpc_link_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_links</code> in a region.
-```sql
-SELECT
-region,
-vpc_link_id
-FROM awscc.apigatewayv2.vpc_links_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_links_list_only</code> resource, see <a href="/services/apigatewayv2/vpc_links/#permissions"><code>vpc_links</code></a>
-
diff --git a/website/docs/services/appconfig/applications/index.md b/website/docs/services/appconfig/applications/index.md
index 76177c67d..387844b06 100644
--- a/website/docs/services/appconfig/applications/index.md
+++ b/website/docs/services/appconfig/applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_id",
+    "type": "string",
+    "description": "The application Id"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-application.html"><code>AWS::AppConfig::Application</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ name
 FROM awscc.appconfig.applications
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>applications</code> in a region.
+```sql
+SELECT
+region,
+application_id
+FROM awscc.appconfig.applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -195,6 +249,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appconfig.applications
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags,
+    "Name": name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appconfig/applications_list_only/index.md b/website/docs/services/appconfig/applications_list_only/index.md
deleted file mode 100644
index 905e1fea0..000000000
--- a/website/docs/services/appconfig/applications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - applications_list_only
-  - appconfig
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>applications</code> in a region or regions, for all properties use <a href="/services/appconfig/applications/"><code>applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppConfig::Application</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appconfig.applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_id",
-    "type": "string",
-    "description": "The application Id"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>applications</code> in a region.
-```sql
-SELECT
-region,
-application_id
-FROM awscc.appconfig.applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>applications_list_only</code> resource, see <a href="/services/appconfig/applications/#permissions"><code>applications</code></a>
-
diff --git a/website/docs/services/appconfig/configuration_profiles/index.md b/website/docs/services/appconfig/configuration_profiles/index.md
index 9d7a4605e..6382f77df 100644
--- a/website/docs/services/appconfig/configuration_profiles/index.md
+++ b/website/docs/services/appconfig/configuration_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>configuration_profile</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "configuration_profile_id",
@@ -124,6 +133,28 @@ Creates, updates, deletes or gets a <code>configuration_profile</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "configuration_profile_id",
+    "type": "string",
+    "description": "The configuration profile ID"
+  },
+  {
+    "name": "application_id",
+    "type": "string",
+    "description": "The application ID."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-configurationprofile.html"><code>AWS::AppConfig::ConfigurationProfile</code></a>.
 
@@ -133,31 +164,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>configuration_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LocationUri, ApplicationId, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>configuration_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>configuration_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>configuration_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>configuration_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -166,6 +203,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>configuration_profile</code>.
 ```sql
 SELECT
@@ -185,6 +231,20 @@ name
 FROM awscc.appconfig.configuration_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationId>|<ConfigurationProfileId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>configuration_profiles</code> in a region.
+```sql
+SELECT
+region,
+application_id,
+configuration_profile_id
+FROM awscc.appconfig.configuration_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -289,6 +349,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appconfig.configuration_profiles
+SET data__PatchDocument = string('{{ {
+    "KmsKeyIdentifier": kms_key_identifier,
+    "Description": description,
+    "Validators": validators,
+    "RetrievalRoleArn": retrieval_role_arn,
+    "DeletionProtectionCheck": deletion_protection_check,
+    "Tags": tags,
+    "Name": name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationId>|<ConfigurationProfileId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appconfig/configuration_profiles_list_only/index.md b/website/docs/services/appconfig/configuration_profiles_list_only/index.md
deleted file mode 100644
index a4636f208..000000000
--- a/website/docs/services/appconfig/configuration_profiles_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: configuration_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - configuration_profiles_list_only
-  - appconfig
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>configuration_profiles</code> in a region or regions, for all properties use <a href="/services/appconfig/configuration_profiles/"><code>configuration_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>configuration_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An example resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appconfig.configuration_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "configuration_profile_id",
-    "type": "string",
-    "description": "The configuration profile ID"
-  },
-  {
-    "name": "application_id",
-    "type": "string",
-    "description": "The application ID."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>configuration_profiles</code> in a region.
-```sql
-SELECT
-region,
-application_id,
-configuration_profile_id
-FROM awscc.appconfig.configuration_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>configuration_profiles_list_only</code> resource, see <a href="/services/appconfig/configuration_profiles/#permissions"><code>configuration_profiles</code></a>
-
diff --git a/website/docs/services/appconfig/deployment_strategies/index.md b/website/docs/services/appconfig/deployment_strategies/index.md
index ee4256d33..69e5ac34a 100644
--- a/website/docs/services/appconfig/deployment_strategies/index.md
+++ b/website/docs/services/appconfig/deployment_strategies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>deployment_strategy</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "deployment_duration_in_minutes",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>deployment_strategy</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The deployment strategy ID."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deploymentstrategy.html"><code>AWS::AppConfig::DeploymentStrategy</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>deployment_strategies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DeploymentDurationInMinutes, GrowthFactor, Name, ReplicateTo, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>deployment_strategies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>deployment_strategies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>deployment_strategies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>deployment_strategies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>deployment_strategy</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ id
 FROM awscc.appconfig.deployment_strategies
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>deployment_strategies</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.appconfig.deployment_strategies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -251,6 +305,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appconfig.deployment_strategies
+SET data__PatchDocument = string('{{ {
+    "DeploymentDurationInMinutes": deployment_duration_in_minutes,
+    "Description": description,
+    "FinalBakeTimeInMinutes": final_bake_time_in_minutes,
+    "GrowthFactor": growth_factor,
+    "GrowthType": growth_type,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appconfig/deployment_strategies_list_only/index.md b/website/docs/services/appconfig/deployment_strategies_list_only/index.md
deleted file mode 100644
index c24a1093f..000000000
--- a/website/docs/services/appconfig/deployment_strategies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: deployment_strategies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - deployment_strategies_list_only
-  - appconfig
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>deployment_strategies</code> in a region or regions, for all properties use <a href="/services/appconfig/deployment_strategies/"><code>deployment_strategies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>deployment_strategies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppConfig::DeploymentStrategy</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appconfig.deployment_strategies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The deployment strategy ID."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>deployment_strategies</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.appconfig.deployment_strategies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>deployment_strategies_list_only</code> resource, see <a href="/services/appconfig/deployment_strategies/#permissions"><code>deployment_strategies</code></a>
-
diff --git a/website/docs/services/appconfig/deployments/index.md b/website/docs/services/appconfig/deployments/index.md
index 94f8faf11..17a7b0d1f 100644
--- a/website/docs/services/appconfig/deployments/index.md
+++ b/website/docs/services/appconfig/deployments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "deployment_strategy_id",
@@ -124,6 +133,33 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "environment_id",
+    "type": "string",
+    "description": "The environment ID."
+  },
+  {
+    "name": "deployment_number",
+    "type": "string",
+    "description": "The sequence number of the deployment."
+  },
+  {
+    "name": "application_id",
+    "type": "string",
+    "description": "The application ID."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deployment.html"><code>AWS::AppConfig::Deployment</code></a>.
 
@@ -133,26 +169,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApplicationId, ConfigurationProfileId, DeploymentStrategyId, EnvironmentId, ConfigurationVersion, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>deployments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +202,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>deployment</code>.
 ```sql
 SELECT
@@ -179,6 +229,21 @@ tags
 FROM awscc.appconfig.deployments
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationId>|<EnvironmentId>|<DeploymentNumber>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>deployments</code> in a region.
+```sql
+SELECT
+region,
+application_id,
+environment_id,
+deployment_number
+FROM awscc.appconfig.deployments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -284,6 +349,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appconfig/deployments_list_only/index.md b/website/docs/services/appconfig/deployments_list_only/index.md
deleted file mode 100644
index 7d6cdb40c..000000000
--- a/website/docs/services/appconfig/deployments_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: deployments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - deployments_list_only
-  - appconfig
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>deployments</code> in a region or regions, for all properties use <a href="/services/appconfig/deployments/"><code>deployments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>deployments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppConfig::Deployment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appconfig.deployments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "environment_id",
-    "type": "string",
-    "description": "The environment ID."
-  },
-  {
-    "name": "deployment_number",
-    "type": "string",
-    "description": "The sequence number of the deployment."
-  },
-  {
-    "name": "application_id",
-    "type": "string",
-    "description": "The application ID."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>deployments</code> in a region.
-```sql
-SELECT
-region,
-application_id,
-environment_id,
-deployment_number
-FROM awscc.appconfig.deployments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>deployments_list_only</code> resource, see <a href="/services/appconfig/deployments/#permissions"><code>deployments</code></a>
-
diff --git a/website/docs/services/appconfig/environments/index.md b/website/docs/services/appconfig/environments/index.md
index 50c3711e8..38890b06d 100644
--- a/website/docs/services/appconfig/environments/index.md
+++ b/website/docs/services/appconfig/environments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "environment_id",
@@ -99,6 +108,28 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "environment_id",
+    "type": "string",
+    "description": "The environment ID."
+  },
+  {
+    "name": "application_id",
+    "type": "string",
+    "description": "The application ID."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-environment.html"><code>AWS::AppConfig::Environment</code></a>.
 
@@ -108,31 +139,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, ApplicationId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>environments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +178,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>environment</code>.
 ```sql
 SELECT
@@ -155,6 +201,20 @@ name
 FROM awscc.appconfig.environments
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationId>|<EnvironmentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>environments</code> in a region.
+```sql
+SELECT
+region,
+application_id,
+environment_id
+FROM awscc.appconfig.environments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -241,6 +301,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appconfig.environments
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Monitors": monitors,
+    "DeletionProtectionCheck": deletion_protection_check,
+    "Tags": tags,
+    "Name": name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationId>|<EnvironmentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appconfig/environments_list_only/index.md b/website/docs/services/appconfig/environments_list_only/index.md
deleted file mode 100644
index 069374bf1..000000000
--- a/website/docs/services/appconfig/environments_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: environments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - environments_list_only
-  - appconfig
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>environments</code> in a region or regions, for all properties use <a href="/services/appconfig/environments/"><code>environments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>environments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppConfig::Environment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appconfig.environments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "environment_id",
-    "type": "string",
-    "description": "The environment ID."
-  },
-  {
-    "name": "application_id",
-    "type": "string",
-    "description": "The application ID."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>environments</code> in a region.
-```sql
-SELECT
-region,
-application_id,
-environment_id
-FROM awscc.appconfig.environments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>environments_list_only</code> resource, see <a href="/services/appconfig/environments/#permissions"><code>environments</code></a>
-
diff --git a/website/docs/services/appconfig/extension_associations/index.md b/website/docs/services/appconfig/extension_associations/index.md
index f3f546c89..96c1f55ae 100644
--- a/website/docs/services/appconfig/extension_associations/index.md
+++ b/website/docs/services/appconfig/extension_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>extension_association</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets an <code>extension_association</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-extensionassociation.html"><code>AWS::AppConfig::ExtensionAssociation</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>extension_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>extension_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>extension_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>extension_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>extension_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>extension_association</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ tags
 FROM awscc.appconfig.extension_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>extension_associations</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.appconfig.extension_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -241,6 +295,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appconfig.extension_associations
+SET data__PatchDocument = string('{{ {
+    "Parameters": parameters,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appconfig/extension_associations_list_only/index.md b/website/docs/services/appconfig/extension_associations_list_only/index.md
deleted file mode 100644
index fbf3525c4..000000000
--- a/website/docs/services/appconfig/extension_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: extension_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - extension_associations_list_only
-  - appconfig
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>extension_associations</code> in a region or regions, for all properties use <a href="/services/appconfig/extension_associations/"><code>extension_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>extension_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An example resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appconfig.extension_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>extension_associations</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.appconfig.extension_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>extension_associations_list_only</code> resource, see <a href="/services/appconfig/extension_associations/#permissions"><code>extension_associations</code></a>
-
diff --git a/website/docs/services/appconfig/extensions/index.md b/website/docs/services/appconfig/extensions/index.md
index 21b9081bf..d95fd7a05 100644
--- a/website/docs/services/appconfig/extensions/index.md
+++ b/website/docs/services/appconfig/extensions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>extension</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets an <code>extension</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-extension.html"><code>AWS::AppConfig::Extension</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>extensions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Actions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>extensions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>extensions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>extensions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>extensions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>extension</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ tags
 FROM awscc.appconfig.extensions
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>extensions</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.appconfig.extensions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -239,6 +293,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appconfig.extensions
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Actions": actions,
+    "Parameters": parameters,
+    "LatestVersionNumber": latest_version_number,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appconfig/extensions_list_only/index.md b/website/docs/services/appconfig/extensions_list_only/index.md
deleted file mode 100644
index f9a976030..000000000
--- a/website/docs/services/appconfig/extensions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: extensions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - extensions_list_only
-  - appconfig
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>extensions</code> in a region or regions, for all properties use <a href="/services/appconfig/extensions/"><code>extensions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>extensions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppConfig::Extension</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appconfig.extensions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>extensions</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.appconfig.extensions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>extensions_list_only</code> resource, see <a href="/services/appconfig/extensions/#permissions"><code>extensions</code></a>
-
diff --git a/website/docs/services/appconfig/hosted_configuration_versions/index.md b/website/docs/services/appconfig/hosted_configuration_versions/index.md
index 2ff89b9f2..694bea8b6 100644
--- a/website/docs/services/appconfig/hosted_configuration_versions/index.md
+++ b/website/docs/services/appconfig/hosted_configuration_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>hosted_configuration_version</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "configuration_profile_id",
@@ -80,6 +89,33 @@ Creates, updates, deletes or gets a <code>hosted_configuration_version</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "configuration_profile_id",
+    "type": "string",
+    "description": "The configuration profile ID."
+  },
+  {
+    "name": "application_id",
+    "type": "string",
+    "description": "The application ID."
+  },
+  {
+    "name": "version_number",
+    "type": "string",
+    "description": "Current version number of hosted configuration version."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-hostedconfigurationversion.html"><code>AWS::AppConfig::HostedConfigurationVersion</code></a>.
 
@@ -89,26 +125,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>hosted_configuration_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApplicationId, ConfigurationProfileId, Content, ContentType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>hosted_configuration_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>hosted_configuration_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>hosted_configuration_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +158,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>hosted_configuration_version</code>.
 ```sql
 SELECT
@@ -132,6 +182,21 @@ version_number
 FROM awscc.appconfig.hosted_configuration_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationId>|<ConfigurationProfileId>|<VersionNumber>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>hosted_configuration_versions</code> in a region.
+```sql
+SELECT
+region,
+application_id,
+configuration_profile_id,
+version_number
+FROM awscc.appconfig.hosted_configuration_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -222,6 +287,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appconfig/hosted_configuration_versions_list_only/index.md b/website/docs/services/appconfig/hosted_configuration_versions_list_only/index.md
deleted file mode 100644
index 104777c04..000000000
--- a/website/docs/services/appconfig/hosted_configuration_versions_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: hosted_configuration_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - hosted_configuration_versions_list_only
-  - appconfig
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>hosted_configuration_versions</code> in a region or regions, for all properties use <a href="/services/appconfig/hosted_configuration_versions/"><code>hosted_configuration_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>hosted_configuration_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppConfig::HostedConfigurationVersion</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appconfig.hosted_configuration_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "configuration_profile_id",
-    "type": "string",
-    "description": "The configuration profile ID."
-  },
-  {
-    "name": "application_id",
-    "type": "string",
-    "description": "The application ID."
-  },
-  {
-    "name": "version_number",
-    "type": "string",
-    "description": "Current version number of hosted configuration version."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>hosted_configuration_versions</code> in a region.
-```sql
-SELECT
-region,
-application_id,
-configuration_profile_id,
-version_number
-FROM awscc.appconfig.hosted_configuration_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>hosted_configuration_versions_list_only</code> resource, see <a href="/services/appconfig/hosted_configuration_versions/#permissions"><code>hosted_configuration_versions</code></a>
-
diff --git a/website/docs/services/appconfig/index.md b/website/docs/services/appconfig/index.md
index f389c3990..e5c08fbf2 100644
--- a/website/docs/services/appconfig/index.md
+++ b/website/docs/services/appconfig/index.md
@@ -20,7 +20,7 @@ The appconfig service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>16</b></span><br />
+<span>total resources:&nbsp;<b>8</b></span><br />
 </div>
 </div>
 
@@ -30,22 +30,14 @@ The appconfig service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/appconfig/applications/">applications</a><br />
-<a href="/services/appconfig/applications_list_only/">applications_list_only</a><br />
 <a href="/services/appconfig/configuration_profiles/">configuration_profiles</a><br />
-<a href="/services/appconfig/configuration_profiles_list_only/">configuration_profiles_list_only</a><br />
 <a href="/services/appconfig/deployment_strategies/">deployment_strategies</a><br />
-<a href="/services/appconfig/deployment_strategies_list_only/">deployment_strategies_list_only</a><br />
-<a href="/services/appconfig/deployments/">deployments</a><br />
-<a href="/services/appconfig/deployments_list_only/">deployments_list_only</a>
+<a href="/services/appconfig/deployments/">deployments</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/appconfig/environments/">environments</a><br />
-<a href="/services/appconfig/environments_list_only/">environments_list_only</a><br />
 <a href="/services/appconfig/extension_associations/">extension_associations</a><br />
-<a href="/services/appconfig/extension_associations_list_only/">extension_associations_list_only</a><br />
 <a href="/services/appconfig/extensions/">extensions</a><br />
-<a href="/services/appconfig/extensions_list_only/">extensions_list_only</a><br />
-<a href="/services/appconfig/hosted_configuration_versions/">hosted_configuration_versions</a><br />
-<a href="/services/appconfig/hosted_configuration_versions_list_only/">hosted_configuration_versions_list_only</a>
+<a href="/services/appconfig/hosted_configuration_versions/">hosted_configuration_versions</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/appflow/connector_profiles/index.md b/website/docs/services/appflow/connector_profiles/index.md
index 03dad88aa..8e1fc46ae 100644
--- a/website/docs/services/appflow/connector_profiles/index.md
+++ b/website/docs/services/appflow/connector_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>connector_profile</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "connector_profile_arn",
@@ -785,6 +794,23 @@ Creates, updates, deletes or gets a <code>connector_profile</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "connector_profile_name",
+    "type": "string",
+    "description": "The maximum number of items to retrieve in a single batch."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-connectorprofile.html"><code>AWS::AppFlow::ConnectorProfile</code></a>.
 
@@ -794,31 +820,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>connector_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConnectorProfileName, ConnectionMode, ConnectorType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>connector_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>connector_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>connector_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>connector_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -827,6 +859,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>connector_profile</code>.
 ```sql
 SELECT
@@ -842,6 +883,19 @@ credentials_arn
 FROM awscc.appflow.connector_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<ConnectorProfileName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>connector_profiles</code> in a region.
+```sql
+SELECT
+region,
+connector_profile_name
+FROM awscc.appflow.connector_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1079,6 +1133,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appflow.connector_profiles
+SET data__PatchDocument = string('{{ {
+    "KMSArn": kms_arn,
+    "ConnectionMode": connection_mode,
+    "ConnectorProfileConfig": connector_profile_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConnectorProfileName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appflow/connector_profiles_list_only/index.md b/website/docs/services/appflow/connector_profiles_list_only/index.md
deleted file mode 100644
index 5c5000ed1..000000000
--- a/website/docs/services/appflow/connector_profiles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: connector_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - connector_profiles_list_only
-  - appflow
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>connector_profiles</code> in a region or regions, for all properties use <a href="/services/appflow/connector_profiles/"><code>connector_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>connector_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppFlow::ConnectorProfile</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appflow.connector_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "connector_profile_name",
-    "type": "string",
-    "description": "The maximum number of items to retrieve in a single batch."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>connector_profiles</code> in a region.
-```sql
-SELECT
-region,
-connector_profile_name
-FROM awscc.appflow.connector_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>connector_profiles_list_only</code> resource, see <a href="/services/appflow/connector_profiles/#permissions"><code>connector_profiles</code></a>
-
diff --git a/website/docs/services/appflow/connectors/index.md b/website/docs/services/appflow/connectors/index.md
index ca927f4c1..3f4af02c6 100644
--- a/website/docs/services/appflow/connectors/index.md
+++ b/website/docs/services/appflow/connectors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>connector</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "connector_label",
@@ -79,6 +88,23 @@ Creates, updates, deletes or gets a <code>connector</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "connector_label",
+    "type": "string",
+    "description": "The name of the connector. The name is unique for each ConnectorRegistration in your AWS account."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-connector.html"><code>AWS::AppFlow::Connector</code></a>.
 
@@ -88,31 +114,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConnectorProvisioningType, ConnectorProvisioningConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>connectors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -121,6 +153,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>connector</code>.
 ```sql
 SELECT
@@ -133,6 +174,19 @@ description
 FROM awscc.appflow.connectors
 WHERE region = 'us-east-1' AND data__Identifier = '<ConnectorLabel>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>connectors</code> in a region.
+```sql
+SELECT
+region,
+connector_label
+FROM awscc.appflow.connectors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -209,6 +263,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appflow.connectors
+SET data__PatchDocument = string('{{ {
+    "ConnectorProvisioningType": connector_provisioning_type,
+    "ConnectorProvisioningConfig": connector_provisioning_config,
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConnectorLabel>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appflow/connectors_list_only/index.md b/website/docs/services/appflow/connectors_list_only/index.md
deleted file mode 100644
index 671d62692..000000000
--- a/website/docs/services/appflow/connectors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: connectors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - connectors_list_only
-  - appflow
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>connectors</code> in a region or regions, for all properties use <a href="/services/appflow/connectors/"><code>connectors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>connectors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::AppFlow::Connector</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appflow.connectors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "connector_label",
-    "type": "string",
-    "description": "The name of the connector. The name is unique for each ConnectorRegistration in your AWS account."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>connectors</code> in a region.
-```sql
-SELECT
-region,
-connector_label
-FROM awscc.appflow.connectors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>connectors_list_only</code> resource, see <a href="/services/appflow/connectors/#permissions"><code>connectors</code></a>
-
diff --git a/website/docs/services/appflow/flows/index.md b/website/docs/services/appflow/flows/index.md
index 802d095f2..d0ebaec2f 100644
--- a/website/docs/services/appflow/flows/index.md
+++ b/website/docs/services/appflow/flows/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>flow</code> resource or lists <code>fl
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "flow_arn",
@@ -907,6 +916,23 @@ Creates, updates, deletes or gets a <code>flow</code> resource or lists <code>fl
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "flow_name",
+    "type": "string",
+    "description": "Name of the flow."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-flow.html"><code>AWS::AppFlow::Flow</code></a>.
 
@@ -916,31 +942,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>flows</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FlowName, Tasks, SourceFlowConfig, DestinationFlowConfigList, TriggerConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>flows</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>flows</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>flows_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>flows</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -949,6 +981,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>flow</code>.
 ```sql
 SELECT
@@ -967,6 +1008,19 @@ metadata_catalog_config
 FROM awscc.appflow.flows
 WHERE region = 'us-east-1' AND data__Identifier = '<FlowName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>flows</code> in a region.
+```sql
+SELECT
+region,
+flow_name
+FROM awscc.appflow.flows_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1245,6 +1299,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appflow.flows
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "TriggerConfig": trigger_config,
+    "FlowStatus": flow_status,
+    "SourceFlowConfig": source_flow_config,
+    "DestinationFlowConfigList": destination_flow_config_list,
+    "Tasks": tasks,
+    "Tags": tags,
+    "MetadataCatalogConfig": metadata_catalog_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FlowName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appflow/flows_list_only/index.md b/website/docs/services/appflow/flows_list_only/index.md
deleted file mode 100644
index 6166ee33c..000000000
--- a/website/docs/services/appflow/flows_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: flows_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - flows_list_only
-  - appflow
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>flows</code> in a region or regions, for all properties use <a href="/services/appflow/flows/"><code>flows</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>flows_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::AppFlow::Flow.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appflow.flows_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "flow_name",
-    "type": "string",
-    "description": "Name of the flow."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>flows</code> in a region.
-```sql
-SELECT
-region,
-flow_name
-FROM awscc.appflow.flows_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>flows_list_only</code> resource, see <a href="/services/appflow/flows/#permissions"><code>flows</code></a>
-
diff --git a/website/docs/services/appflow/index.md b/website/docs/services/appflow/index.md
index 9022e7f31..3a903719f 100644
--- a/website/docs/services/appflow/index.md
+++ b/website/docs/services/appflow/index.md
@@ -20,7 +20,7 @@ The appflow service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The appflow service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/appflow/connector_profiles/">connector_profiles</a><br />
-<a href="/services/appflow/connector_profiles_list_only/">connector_profiles_list_only</a><br />
 <a href="/services/appflow/connectors/">connectors</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/appflow/connectors_list_only/">connectors_list_only</a><br />
-<a href="/services/appflow/flows/">flows</a><br />
-<a href="/services/appflow/flows_list_only/">flows_list_only</a>
+<a href="/services/appflow/flows/">flows</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/appintegrations/applications/index.md b/website/docs/services/appintegrations/applications/index.md
index ae7997e13..ede68e888 100644
--- a/website/docs/services/appintegrations/applications/index.md
+++ b/website/docs/services/appintegrations/applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -157,6 +166,23 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the application."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appintegrations-application.html"><code>AWS::AppIntegrations::Application</code></a>.
 
@@ -166,31 +192,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Namespace, Description, ApplicationSourceConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -199,6 +231,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application</code>.
 ```sql
 SELECT
@@ -218,6 +259,19 @@ iframe_config
 FROM awscc.appintegrations.applications
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>applications</code> in a region.
+```sql
+SELECT
+region,
+application_arn
+FROM awscc.appintegrations.applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -333,6 +387,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appintegrations.applications
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Namespace": namespace,
+    "Description": description,
+    "ApplicationSourceConfig": application_source_config,
+    "Permissions": permissions,
+    "Tags": tags,
+    "IsService": is_service,
+    "InitializationTimeout": initialization_timeout,
+    "ApplicationConfig": application_config,
+    "IframeConfig": iframe_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appintegrations/applications_list_only/index.md b/website/docs/services/appintegrations/applications_list_only/index.md
deleted file mode 100644
index 22583c21f..000000000
--- a/website/docs/services/appintegrations/applications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - applications_list_only
-  - appintegrations
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>applications</code> in a region or regions, for all properties use <a href="/services/appintegrations/applications/"><code>applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS:AppIntegrations::Application</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appintegrations.applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the application."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>applications</code> in a region.
-```sql
-SELECT
-region,
-application_arn
-FROM awscc.appintegrations.applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>applications_list_only</code> resource, see <a href="/services/appintegrations/applications/#permissions"><code>applications</code></a>
-
diff --git a/website/docs/services/appintegrations/data_integrations/index.md b/website/docs/services/appintegrations/data_integrations/index.md
index c803b5ce8..e19a4c840 100644
--- a/website/docs/services/appintegrations/data_integrations/index.md
+++ b/website/docs/services/appintegrations/data_integrations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_integration</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -131,6 +140,23 @@ Creates, updates, deletes or gets a <code>data_integration</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The unique identifer of the data integration."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appintegrations-dataintegration.html"><code>AWS::AppIntegrations::DataIntegration</code></a>.
 
@@ -140,31 +166,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_integrations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, KmsKey, SourceURI, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_integrations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_integrations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_integrations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_integrations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -173,6 +205,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_integration</code>.
 ```sql
 SELECT
@@ -190,6 +231,19 @@ object_configuration
 FROM awscc.appintegrations.data_integrations
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_integrations</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.appintegrations.data_integrations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -290,6 +344,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appintegrations.data_integrations
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Name": name,
+    "Tags": tags,
+    "FileConfiguration": file_configuration,
+    "ObjectConfiguration": object_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appintegrations/data_integrations_list_only/index.md b/website/docs/services/appintegrations/data_integrations_list_only/index.md
deleted file mode 100644
index ad3911a1a..000000000
--- a/website/docs/services/appintegrations/data_integrations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: data_integrations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_integrations_list_only
-  - appintegrations
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_integrations</code> in a region or regions, for all properties use <a href="/services/appintegrations/data_integrations/"><code>data_integrations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_integrations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppIntegrations::DataIntegration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appintegrations.data_integrations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The unique identifer of the data integration."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_integrations</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.appintegrations.data_integrations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_integrations_list_only</code> resource, see <a href="/services/appintegrations/data_integrations/#permissions"><code>data_integrations</code></a>
-
diff --git a/website/docs/services/appintegrations/event_integrations/index.md b/website/docs/services/appintegrations/event_integrations/index.md
index a60e20f4a..f5d03466f 100644
--- a/website/docs/services/appintegrations/event_integrations/index.md
+++ b/website/docs/services/appintegrations/event_integrations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>event_integration</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -89,6 +98,23 @@ Creates, updates, deletes or gets an <code>event_integration</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the event integration."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appintegrations-eventintegration.html"><code>AWS::AppIntegrations::EventIntegration</code></a>.
 
@@ -98,31 +124,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>event_integrations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, EventBridgeBus, EventFilter, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>event_integrations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>event_integrations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>event_integrations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>event_integrations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -131,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>event_integration</code>.
 ```sql
 SELECT
@@ -144,6 +185,19 @@ tags
 FROM awscc.appintegrations.event_integrations
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>event_integrations</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.appintegrations.event_integrations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -227,6 +281,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appintegrations.event_integrations
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appintegrations/event_integrations_list_only/index.md b/website/docs/services/appintegrations/event_integrations_list_only/index.md
deleted file mode 100644
index 3922b2ced..000000000
--- a/website/docs/services/appintegrations/event_integrations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: event_integrations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - event_integrations_list_only
-  - appintegrations
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>event_integrations</code> in a region or regions, for all properties use <a href="/services/appintegrations/event_integrations/"><code>event_integrations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>event_integrations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppIntegrations::EventIntegration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appintegrations.event_integrations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the event integration."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>event_integrations</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.appintegrations.event_integrations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>event_integrations_list_only</code> resource, see <a href="/services/appintegrations/event_integrations/#permissions"><code>event_integrations</code></a>
-
diff --git a/website/docs/services/appintegrations/index.md b/website/docs/services/appintegrations/index.md
index 01cb0cb71..f1e4db7ec 100644
--- a/website/docs/services/appintegrations/index.md
+++ b/website/docs/services/appintegrations/index.md
@@ -20,7 +20,7 @@ The appintegrations service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The appintegrations service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/appintegrations/applications/">applications</a><br />
-<a href="/services/appintegrations/applications_list_only/">applications_list_only</a><br />
 <a href="/services/appintegrations/data_integrations/">data_integrations</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/appintegrations/data_integrations_list_only/">data_integrations_list_only</a><br />
-<a href="/services/appintegrations/event_integrations/">event_integrations</a><br />
-<a href="/services/appintegrations/event_integrations_list_only/">event_integrations_list_only</a>
+<a href="/services/appintegrations/event_integrations/">event_integrations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/applicationautoscaling/index.md b/website/docs/services/applicationautoscaling/index.md
index 6b7310f3c..cec14be25 100644
--- a/website/docs/services/applicationautoscaling/index.md
+++ b/website/docs/services/applicationautoscaling/index.md
@@ -20,7 +20,7 @@ The applicationautoscaling service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The applicationautoscaling service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/applicationautoscaling/scalable_targets/">scalable_targets</a><br />
-<a href="/services/applicationautoscaling/scalable_targets_list_only/">scalable_targets_list_only</a>
+<a href="/services/applicationautoscaling/scalable_targets/">scalable_targets</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/applicationautoscaling/scaling_policies/">scaling_policies</a><br />
-<a href="/services/applicationautoscaling/scaling_policies_list_only/">scaling_policies_list_only</a>
+<a href="/services/applicationautoscaling/scaling_policies/">scaling_policies</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/applicationautoscaling/scalable_targets/index.md b/website/docs/services/applicationautoscaling/scalable_targets/index.md
index 4aef81408..6eaf4a2f0 100644
--- a/website/docs/services/applicationautoscaling/scalable_targets/index.md
+++ b/website/docs/services/applicationautoscaling/scalable_targets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>scalable_target</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "scheduled_actions",
@@ -146,6 +155,38 @@ Creates, updates, deletes or gets a <code>scalable_target</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "resource_id",
+    "type": "string",
+    "description": "The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier.<br />+ ECS service - The resource type is &#96;&#96;service&#96;&#96; and the unique identifier is the cluster name and service name. Example: &#96;&#96;service/my-cluster/my-service&#96;&#96;.<br />+ Spot Fleet - The resource type is &#96;&#96;spot-fleet-request&#96;&#96; and the unique identifier is the Spot Fleet request ID. Example: &#96;&#96;spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE&#96;&#96;.<br />+ EMR cluster - The resource type is &#96;&#96;instancegroup&#96;&#96; and the unique identifier is the cluster ID and instance group ID. Example: &#96;&#96;instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0&#96;&#96;.<br />+ AppStream 2.0 fleet - The resource type is &#96;&#96;fleet&#96;&#96; and the unique identifier is the fleet name. Example: &#96;&#96;fleet/sample-fleet&#96;&#96;.<br />+ DynamoDB table - The resource type is &#96;&#96;table&#96;&#96; and the unique identifier is the table name. Example: &#96;&#96;table/my-table&#96;&#96;.<br />+ DynamoDB global secondary index - The resource type is &#96;&#96;index&#96;&#96; and the unique identifier is the index name. Example: &#96;&#96;table/my-table/index/my-table-index&#96;&#96;.<br />+ Aurora DB cluster - The resource type is &#96;&#96;cluster&#96;&#96; and the unique identifier is the cluster name. Example: &#96;&#96;cluster:my-db-cluster&#96;&#96;.<br />+ SageMaker endpoint variant - The resource type is &#96;&#96;variant&#96;&#96; and the unique identifier is the resource ID. Example: &#96;&#96;endpoint/my-end-point/variant/KMeansClustering&#96;&#96;.<br />+ Custom resources are not supported with a resource type. This parameter must specify the &#96;&#96;OutputValue&#96;&#96; from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our &#91;GitHub repository&#93;(https://docs.aws.amazon.com/https://github.com/aws/aws-auto-scaling-custom-resource).<br />+ Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: &#96;&#96;arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE&#96;&#96;.<br />+ Amazon Comprehend entity recognizer endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: &#96;&#96;arn:aws:comprehend:us-west-2:123456789012:entity-recognizer-endpoint/EXAMPLE&#96;&#96;.<br />+ Lambda provisioned concurrency - The resource type is &#96;&#96;function&#96;&#96; and the unique identifier is the function name with a function version or alias name suffix that is not &#96;&#96;$LATEST&#96;&#96;. Example: &#96;&#96;function:my-function:prod&#96;&#96; or &#96;&#96;function:my-function:1&#96;&#96;.<br />+ Amazon Keyspaces table - The resource type is &#96;&#96;table&#96;&#96; and the unique identifier is the table name. Example: &#96;&#96;keyspace/mykeyspace/table/mytable&#96;&#96;.<br />+ Amazon MSK cluster - The resource type and unique identifier are specified using the cluster ARN. Example: &#96;&#96;arn:aws:kafka:us-east-1:123456789012:cluster/demo-cluster-1/6357e0b2-0e6a-4b86-a0b4-70df934c2e31-5&#96;&#96;.<br />+ Amazon ElastiCache replication group - The resource type is &#96;&#96;replication-group&#96;&#96; and the unique identifier is the replication group name. Example: &#96;&#96;replication-group/mycluster&#96;&#96;.<br />+ Amazon ElastiCache cache cluster - The resource type is &#96;&#96;cache-cluster&#96;&#96; and the unique identifier is the cache cluster name. Example: &#96;&#96;cache-cluster/mycluster&#96;&#96;.<br />+ Neptune cluster - The resource type is &#96;&#96;cluster&#96;&#96; and the unique identifier is the cluster name. Example: &#96;&#96;cluster:mycluster&#96;&#96;.<br />+ SageMaker serverless endpoint - The resource type is &#96;&#96;variant&#96;&#96; and the unique identifier is the resource ID. Example: &#96;&#96;endpoint/my-end-point/variant/KMeansClustering&#96;&#96;.<br />+ SageMaker inference component - The resource type is &#96;&#96;inference-component&#96;&#96; and the unique identifier is the resource ID. Example: &#96;&#96;inference-component/my-inference-component&#96;&#96;.<br />+ Pool of WorkSpaces - The resource type is &#96;&#96;workspacespool&#96;&#96; and the unique identifier is the pool ID. Example: &#96;&#96;workspacespool/wspool-123456&#96;&#96;."
+  },
+  {
+    "name": "service_namespace",
+    "type": "string",
+    "description": "The namespace of the AWS service that provides the resource, or a &#96;&#96;custom-resource&#96;&#96;."
+  },
+  {
+    "name": "scalable_dimension",
+    "type": "string",
+    "description": "The scalable dimension associated with the scalable target. This string consists of the service namespace, resource type, and scaling property.<br />+ &#96;&#96;ecs:service:DesiredCount&#96;&#96; - The task count of an ECS service.<br />+ &#96;&#96;elasticmapreduce:instancegroup:InstanceCount&#96;&#96; - The instance count of an EMR Instance Group.<br />+ &#96;&#96;ec2:spot-fleet-request:TargetCapacity&#96;&#96; - The target capacity of a Spot Fleet.<br />+ &#96;&#96;appstream:fleet:DesiredCapacity&#96;&#96; - The capacity of an AppStream 2.0 fleet.<br />+ &#96;&#96;dynamodb:table:ReadCapacityUnits&#96;&#96; - The provisioned read capacity for a DynamoDB table.<br />+ &#96;&#96;dynamodb:table:WriteCapacityUnits&#96;&#96; - The provisioned write capacity for a DynamoDB table.<br />+ &#96;&#96;dynamodb:index:ReadCapacityUnits&#96;&#96; - The provisioned read capacity for a DynamoDB global secondary index.<br />+ &#96;&#96;dynamodb:index:WriteCapacityUnits&#96;&#96; - The provisioned write capacity for a DynamoDB global secondary index.<br />+ &#96;&#96;rds:cluster:ReadReplicaCount&#96;&#96; - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.<br />+ &#96;&#96;sagemaker:variant:DesiredInstanceCount&#96;&#96; - The number of EC2 instances for a SageMaker model endpoint variant.<br />+ &#96;&#96;custom-resource:ResourceType:Property&#96;&#96; - The scalable dimension for a custom resource provided by your own application or service.<br />+ &#96;&#96;comprehend:document-classifier-endpoint:DesiredInferenceUnits&#96;&#96; - The number of inference units for an Amazon Comprehend document classification endpoint.<br />+ &#96;&#96;comprehend:entity-recognizer-endpoint:DesiredInferenceUnits&#96;&#96; - The number of inference units for an Amazon Comprehend entity recognizer endpoint.<br />+ &#96;&#96;lambda:function:ProvisionedConcurrency&#96;&#96; - The provisioned concurrency for a Lambda function.<br />+ &#96;&#96;cassandra:table:ReadCapacityUnits&#96;&#96; - The provisioned read capacity for an Amazon Keyspaces table.<br />+ &#96;&#96;cassandra:table:WriteCapacityUnits&#96;&#96; - The provisioned write capacity for an Amazon Keyspaces table.<br />+ &#96;&#96;kafka:broker-storage:VolumeSize&#96;&#96; - The provisioned volume size (in GiB) for brokers in an Amazon MSK cluster.<br />+ &#96;&#96;elasticache:cache-cluster:Nodes&#96;&#96; - The number of nodes for an Amazon ElastiCache cache cluster.<br />+ &#96;&#96;elasticache:replication-group:NodeGroups&#96;&#96; - The number of node groups for an Amazon ElastiCache replication group.<br />+ &#96;&#96;elasticache:replication-group:Replicas&#96;&#96; - The number of replicas per node group for an Amazon ElastiCache replication group.<br />+ &#96;&#96;neptune:cluster:ReadReplicaCount&#96;&#96; - The count of read replicas in an Amazon Neptune DB cluster.<br />+ &#96;&#96;sagemaker:variant:DesiredProvisionedConcurrency&#96;&#96; - The provisioned concurrency for a SageMaker serverless endpoint.<br />+ &#96;&#96;sagemaker:inference-component:DesiredCopyCount&#96;&#96; - The number of copies across an endpoint for a SageMaker inference component.<br />+ &#96;&#96;workspaces:workspacespool:DesiredUserSessions&#96;&#96; - The number of user sessions for the WorkSpaces in the pool."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html"><code>AWS::ApplicationAutoScaling::ScalableTarget</code></a>.
 
@@ -155,31 +196,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>scalable_targets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResourceId, ServiceNamespace, ScalableDimension, MinCapacity, MaxCapacity, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>scalable_targets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>scalable_targets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>scalable_targets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>scalable_targets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -188,6 +235,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>scalable_target</code>.
 ```sql
 SELECT
@@ -204,6 +260,21 @@ max_capacity
 FROM awscc.applicationautoscaling.scalable_targets
 WHERE region = 'us-east-1' AND data__Identifier = '<ResourceId>|<ScalableDimension>|<ServiceNamespace>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>scalable_targets</code> in a region.
+```sql
+SELECT
+region,
+resource_id,
+scalable_dimension,
+service_namespace
+FROM awscc.applicationautoscaling.scalable_targets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -311,6 +382,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.applicationautoscaling.scalable_targets
+SET data__PatchDocument = string('{{ {
+    "ScheduledActions": scheduled_actions,
+    "SuspendedState": suspended_state,
+    "MinCapacity": min_capacity,
+    "RoleARN": role_arn,
+    "MaxCapacity": max_capacity
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ResourceId>|<ScalableDimension>|<ServiceNamespace>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/applicationautoscaling/scalable_targets_list_only/index.md b/website/docs/services/applicationautoscaling/scalable_targets_list_only/index.md
deleted file mode 100644
index bff9cbc80..000000000
--- a/website/docs/services/applicationautoscaling/scalable_targets_list_only/index.md
+++ /dev/null
@@ -1,97 +0,0 @@
----
-title: scalable_targets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - scalable_targets_list_only
-  - applicationautoscaling
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>scalable_targets</code> in a region or regions, for all properties use <a href="/services/applicationautoscaling/scalable_targets/"><code>scalable_targets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>scalable_targets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApplicationAutoScaling::ScalableTarget&#96;&#96; resource specifies a resource that Application Auto Scaling can scale, such as an AWS::DynamoDB::Table or AWS::ECS::Service resource.<br />For more information, see &#91;Getting started&#93;(https://docs.aws.amazon.com/autoscaling/application/userguide/getting-started.html) in the &#42;Application Auto Scaling User Guide&#42;.<br />If the resource that you want Application Auto Scaling to scale is not yet created in your account, add a dependency on the resource when registering it as a scalable target using the &#91;DependsOn&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-dependson.html) attribute.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.applicationautoscaling.scalable_targets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "resource_id",
-    "type": "string",
-    "description": "The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier.<br />+ ECS service - The resource type is &#96;&#96;service&#96;&#96; and the unique identifier is the cluster name and service name. Example: &#96;&#96;service/my-cluster/my-service&#96;&#96;.<br />+ Spot Fleet - The resource type is &#96;&#96;spot-fleet-request&#96;&#96; and the unique identifier is the Spot Fleet request ID. Example: &#96;&#96;spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE&#96;&#96;.<br />+ EMR cluster - The resource type is &#96;&#96;instancegroup&#96;&#96; and the unique identifier is the cluster ID and instance group ID. Example: &#96;&#96;instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0&#96;&#96;.<br />+ AppStream 2.0 fleet - The resource type is &#96;&#96;fleet&#96;&#96; and the unique identifier is the fleet name. Example: &#96;&#96;fleet/sample-fleet&#96;&#96;.<br />+ DynamoDB table - The resource type is &#96;&#96;table&#96;&#96; and the unique identifier is the table name. Example: &#96;&#96;table/my-table&#96;&#96;.<br />+ DynamoDB global secondary index - The resource type is &#96;&#96;index&#96;&#96; and the unique identifier is the index name. Example: &#96;&#96;table/my-table/index/my-table-index&#96;&#96;.<br />+ Aurora DB cluster - The resource type is &#96;&#96;cluster&#96;&#96; and the unique identifier is the cluster name. Example: &#96;&#96;cluster:my-db-cluster&#96;&#96;.<br />+ SageMaker endpoint variant - The resource type is &#96;&#96;variant&#96;&#96; and the unique identifier is the resource ID. Example: &#96;&#96;endpoint/my-end-point/variant/KMeansClustering&#96;&#96;.<br />+ Custom resources are not supported with a resource type. This parameter must specify the &#96;&#96;OutputValue&#96;&#96; from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our &#91;GitHub repository&#93;(https://docs.aws.amazon.com/https://github.com/aws/aws-auto-scaling-custom-resource).<br />+ Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: &#96;&#96;arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE&#96;&#96;.<br />+ Amazon Comprehend entity recognizer endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: &#96;&#96;arn:aws:comprehend:us-west-2:123456789012:entity-recognizer-endpoint/EXAMPLE&#96;&#96;.<br />+ Lambda provisioned concurrency - The resource type is &#96;&#96;function&#96;&#96; and the unique identifier is the function name with a function version or alias name suffix that is not &#96;&#96;$LATEST&#96;&#96;. Example: &#96;&#96;function:my-function:prod&#96;&#96; or &#96;&#96;function:my-function:1&#96;&#96;.<br />+ Amazon Keyspaces table - The resource type is &#96;&#96;table&#96;&#96; and the unique identifier is the table name. Example: &#96;&#96;keyspace/mykeyspace/table/mytable&#96;&#96;.<br />+ Amazon MSK cluster - The resource type and unique identifier are specified using the cluster ARN. Example: &#96;&#96;arn:aws:kafka:us-east-1:123456789012:cluster/demo-cluster-1/6357e0b2-0e6a-4b86-a0b4-70df934c2e31-5&#96;&#96;.<br />+ Amazon ElastiCache replication group - The resource type is &#96;&#96;replication-group&#96;&#96; and the unique identifier is the replication group name. Example: &#96;&#96;replication-group/mycluster&#96;&#96;.<br />+ Amazon ElastiCache cache cluster - The resource type is &#96;&#96;cache-cluster&#96;&#96; and the unique identifier is the cache cluster name. Example: &#96;&#96;cache-cluster/mycluster&#96;&#96;.<br />+ Neptune cluster - The resource type is &#96;&#96;cluster&#96;&#96; and the unique identifier is the cluster name. Example: &#96;&#96;cluster:mycluster&#96;&#96;.<br />+ SageMaker serverless endpoint - The resource type is &#96;&#96;variant&#96;&#96; and the unique identifier is the resource ID. Example: &#96;&#96;endpoint/my-end-point/variant/KMeansClustering&#96;&#96;.<br />+ SageMaker inference component - The resource type is &#96;&#96;inference-component&#96;&#96; and the unique identifier is the resource ID. Example: &#96;&#96;inference-component/my-inference-component&#96;&#96;.<br />+ Pool of WorkSpaces - The resource type is &#96;&#96;workspacespool&#96;&#96; and the unique identifier is the pool ID. Example: &#96;&#96;workspacespool/wspool-123456&#96;&#96;."
-  },
-  {
-    "name": "service_namespace",
-    "type": "string",
-    "description": "The namespace of the AWS service that provides the resource, or a &#96;&#96;custom-resource&#96;&#96;."
-  },
-  {
-    "name": "scalable_dimension",
-    "type": "string",
-    "description": "The scalable dimension associated with the scalable target. This string consists of the service namespace, resource type, and scaling property.<br />+ &#96;&#96;ecs:service:DesiredCount&#96;&#96; - The task count of an ECS service.<br />+ &#96;&#96;elasticmapreduce:instancegroup:InstanceCount&#96;&#96; - The instance count of an EMR Instance Group.<br />+ &#96;&#96;ec2:spot-fleet-request:TargetCapacity&#96;&#96; - The target capacity of a Spot Fleet.<br />+ &#96;&#96;appstream:fleet:DesiredCapacity&#96;&#96; - The capacity of an AppStream 2.0 fleet.<br />+ &#96;&#96;dynamodb:table:ReadCapacityUnits&#96;&#96; - The provisioned read capacity for a DynamoDB table.<br />+ &#96;&#96;dynamodb:table:WriteCapacityUnits&#96;&#96; - The provisioned write capacity for a DynamoDB table.<br />+ &#96;&#96;dynamodb:index:ReadCapacityUnits&#96;&#96; - The provisioned read capacity for a DynamoDB global secondary index.<br />+ &#96;&#96;dynamodb:index:WriteCapacityUnits&#96;&#96; - The provisioned write capacity for a DynamoDB global secondary index.<br />+ &#96;&#96;rds:cluster:ReadReplicaCount&#96;&#96; - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.<br />+ &#96;&#96;sagemaker:variant:DesiredInstanceCount&#96;&#96; - The number of EC2 instances for a SageMaker model endpoint variant.<br />+ &#96;&#96;custom-resource:ResourceType:Property&#96;&#96; - The scalable dimension for a custom resource provided by your own application or service.<br />+ &#96;&#96;comprehend:document-classifier-endpoint:DesiredInferenceUnits&#96;&#96; - The number of inference units for an Amazon Comprehend document classification endpoint.<br />+ &#96;&#96;comprehend:entity-recognizer-endpoint:DesiredInferenceUnits&#96;&#96; - The number of inference units for an Amazon Comprehend entity recognizer endpoint.<br />+ &#96;&#96;lambda:function:ProvisionedConcurrency&#96;&#96; - The provisioned concurrency for a Lambda function.<br />+ &#96;&#96;cassandra:table:ReadCapacityUnits&#96;&#96; - The provisioned read capacity for an Amazon Keyspaces table.<br />+ &#96;&#96;cassandra:table:WriteCapacityUnits&#96;&#96; - The provisioned write capacity for an Amazon Keyspaces table.<br />+ &#96;&#96;kafka:broker-storage:VolumeSize&#96;&#96; - The provisioned volume size (in GiB) for brokers in an Amazon MSK cluster.<br />+ &#96;&#96;elasticache:cache-cluster:Nodes&#96;&#96; - The number of nodes for an Amazon ElastiCache cache cluster.<br />+ &#96;&#96;elasticache:replication-group:NodeGroups&#96;&#96; - The number of node groups for an Amazon ElastiCache replication group.<br />+ &#96;&#96;elasticache:replication-group:Replicas&#96;&#96; - The number of replicas per node group for an Amazon ElastiCache replication group.<br />+ &#96;&#96;neptune:cluster:ReadReplicaCount&#96;&#96; - The count of read replicas in an Amazon Neptune DB cluster.<br />+ &#96;&#96;sagemaker:variant:DesiredProvisionedConcurrency&#96;&#96; - The provisioned concurrency for a SageMaker serverless endpoint.<br />+ &#96;&#96;sagemaker:inference-component:DesiredCopyCount&#96;&#96; - The number of copies across an endpoint for a SageMaker inference component.<br />+ &#96;&#96;workspaces:workspacespool:DesiredUserSessions&#96;&#96; - The number of user sessions for the WorkSpaces in the pool."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>scalable_targets</code> in a region.
-```sql
-SELECT
-region,
-resource_id,
-scalable_dimension,
-service_namespace
-FROM awscc.applicationautoscaling.scalable_targets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>scalable_targets_list_only</code> resource, see <a href="/services/applicationautoscaling/scalable_targets/#permissions"><code>scalable_targets</code></a>
-
diff --git a/website/docs/services/applicationautoscaling/scaling_policies/index.md b/website/docs/services/applicationautoscaling/scaling_policies/index.md
index 0c663facd..cd958d7a1 100644
--- a/website/docs/services/applicationautoscaling/scaling_policies/index.md
+++ b/website/docs/services/applicationautoscaling/scaling_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>scaling_policy</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "policy_type",
@@ -370,6 +379,28 @@ Creates, updates, deletes or gets a <code>scaling_policy</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "scalable_dimension",
+    "type": "string",
+    "description": "The scalable dimension. This string consists of the service namespace, resource type, and scaling property.<br />+ &#96;&#96;ecs:service:DesiredCount&#96;&#96; - The task count of an ECS service.<br />+ &#96;&#96;elasticmapreduce:instancegroup:InstanceCount&#96;&#96; - The instance count of an EMR Instance Group.<br />+ &#96;&#96;ec2:spot-fleet-request:TargetCapacity&#96;&#96; - The target capacity of a Spot Fleet.<br />+ &#96;&#96;appstream:fleet:DesiredCapacity&#96;&#96; - The capacity of an AppStream 2.0 fleet.<br />+ &#96;&#96;dynamodb:table:ReadCapacityUnits&#96;&#96; - The provisioned read capacity for a DynamoDB table.<br />+ &#96;&#96;dynamodb:table:WriteCapacityUnits&#96;&#96; - The provisioned write capacity for a DynamoDB table.<br />+ &#96;&#96;dynamodb:index:ReadCapacityUnits&#96;&#96; - The provisioned read capacity for a DynamoDB global secondary index.<br />+ &#96;&#96;dynamodb:index:WriteCapacityUnits&#96;&#96; - The provisioned write capacity for a DynamoDB global secondary index.<br />+ &#96;&#96;rds:cluster:ReadReplicaCount&#96;&#96; - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.<br />+ &#96;&#96;sagemaker:variant:DesiredInstanceCount&#96;&#96; - The number of EC2 instances for a SageMaker model endpoint variant.<br />+ &#96;&#96;custom-resource:ResourceType:Property&#96;&#96; - The scalable dimension for a custom resource provided by your own application or service.<br />+ &#96;&#96;comprehend:document-classifier-endpoint:DesiredInferenceUnits&#96;&#96; - The number of inference units for an Amazon Comprehend document classification endpoint.<br />+ &#96;&#96;comprehend:entity-recognizer-endpoint:DesiredInferenceUnits&#96;&#96; - The number of inference units for an Amazon Comprehend entity recognizer endpoint.<br />+ &#96;&#96;lambda:function:ProvisionedConcurrency&#96;&#96; - The provisioned concurrency for a Lambda function.<br />+ &#96;&#96;cassandra:table:ReadCapacityUnits&#96;&#96; - The provisioned read capacity for an Amazon Keyspaces table.<br />+ &#96;&#96;cassandra:table:WriteCapacityUnits&#96;&#96; - The provisioned write capacity for an Amazon Keyspaces table.<br />+ &#96;&#96;kafka:broker-storage:VolumeSize&#96;&#96; - The provisioned volume size (in GiB) for brokers in an Amazon MSK cluster.<br />+ &#96;&#96;elasticache:cache-cluster:Nodes&#96;&#96; - The number of nodes for an Amazon ElastiCache cache cluster.<br />+ &#96;&#96;elasticache:replication-group:NodeGroups&#96;&#96; - The number of node groups for an Amazon ElastiCache replication group.<br />+ &#96;&#96;elasticache:replication-group:Replicas&#96;&#96; - The number of replicas per node group for an Amazon ElastiCache replication group.<br />+ &#96;&#96;neptune:cluster:ReadReplicaCount&#96;&#96; - The count of read replicas in an Amazon Neptune DB cluster.<br />+ &#96;&#96;sagemaker:variant:DesiredProvisionedConcurrency&#96;&#96; - The provisioned concurrency for a SageMaker serverless endpoint.<br />+ &#96;&#96;sagemaker:inference-component:DesiredCopyCount&#96;&#96; - The number of copies across an endpoint for a SageMaker inference component.<br />+ &#96;&#96;workspaces:workspacespool:DesiredUserSessions&#96;&#96; - The number of user sessions for the WorkSpaces in the pool."
+  },
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html"><code>AWS::ApplicationAutoScaling::ScalingPolicy</code></a>.
 
@@ -379,31 +410,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>scaling_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PolicyName, PolicyType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>scaling_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>scaling_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>scaling_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>scaling_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -412,6 +449,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>scaling_policy</code>.
 ```sql
 SELECT
@@ -429,6 +475,20 @@ predictive_scaling_policy_configuration
 FROM awscc.applicationautoscaling.scaling_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>|<ScalableDimension>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>scaling_policies</code> in a region.
+```sql
+SELECT
+region,
+arn,
+scalable_dimension
+FROM awscc.applicationautoscaling.scaling_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -596,6 +656,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.applicationautoscaling.scaling_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyType": policy_type,
+    "TargetTrackingScalingPolicyConfiguration": target_tracking_scaling_policy_configuration,
+    "StepScalingPolicyConfiguration": step_scaling_policy_configuration,
+    "PredictiveScalingPolicyConfiguration": predictive_scaling_policy_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>|<ScalableDimension>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/applicationautoscaling/scaling_policies_list_only/index.md b/website/docs/services/applicationautoscaling/scaling_policies_list_only/index.md
deleted file mode 100644
index 2ca96e4f3..000000000
--- a/website/docs/services/applicationautoscaling/scaling_policies_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: scaling_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - scaling_policies_list_only
-  - applicationautoscaling
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>scaling_policies</code> in a region or regions, for all properties use <a href="/services/applicationautoscaling/scaling_policies/"><code>scaling_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>scaling_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ApplicationAutoScaling::ScalingPolicy&#96;&#96; resource defines a scaling policy that Application Auto Scaling uses to adjust the capacity of a scalable target. <br />For more information, see &#91;Target tracking scaling policies&#93;(https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html) and &#91;Step scaling policies&#93;(https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-step-scaling-policies.html) in the &#42;Application Auto Scaling User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.applicationautoscaling.scaling_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "scalable_dimension",
-    "type": "string",
-    "description": "The scalable dimension. This string consists of the service namespace, resource type, and scaling property.<br />+ &#96;&#96;ecs:service:DesiredCount&#96;&#96; - The task count of an ECS service.<br />+ &#96;&#96;elasticmapreduce:instancegroup:InstanceCount&#96;&#96; - The instance count of an EMR Instance Group.<br />+ &#96;&#96;ec2:spot-fleet-request:TargetCapacity&#96;&#96; - The target capacity of a Spot Fleet.<br />+ &#96;&#96;appstream:fleet:DesiredCapacity&#96;&#96; - The capacity of an AppStream 2.0 fleet.<br />+ &#96;&#96;dynamodb:table:ReadCapacityUnits&#96;&#96; - The provisioned read capacity for a DynamoDB table.<br />+ &#96;&#96;dynamodb:table:WriteCapacityUnits&#96;&#96; - The provisioned write capacity for a DynamoDB table.<br />+ &#96;&#96;dynamodb:index:ReadCapacityUnits&#96;&#96; - The provisioned read capacity for a DynamoDB global secondary index.<br />+ &#96;&#96;dynamodb:index:WriteCapacityUnits&#96;&#96; - The provisioned write capacity for a DynamoDB global secondary index.<br />+ &#96;&#96;rds:cluster:ReadReplicaCount&#96;&#96; - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.<br />+ &#96;&#96;sagemaker:variant:DesiredInstanceCount&#96;&#96; - The number of EC2 instances for a SageMaker model endpoint variant.<br />+ &#96;&#96;custom-resource:ResourceType:Property&#96;&#96; - The scalable dimension for a custom resource provided by your own application or service.<br />+ &#96;&#96;comprehend:document-classifier-endpoint:DesiredInferenceUnits&#96;&#96; - The number of inference units for an Amazon Comprehend document classification endpoint.<br />+ &#96;&#96;comprehend:entity-recognizer-endpoint:DesiredInferenceUnits&#96;&#96; - The number of inference units for an Amazon Comprehend entity recognizer endpoint.<br />+ &#96;&#96;lambda:function:ProvisionedConcurrency&#96;&#96; - The provisioned concurrency for a Lambda function.<br />+ &#96;&#96;cassandra:table:ReadCapacityUnits&#96;&#96; - The provisioned read capacity for an Amazon Keyspaces table.<br />+ &#96;&#96;cassandra:table:WriteCapacityUnits&#96;&#96; - The provisioned write capacity for an Amazon Keyspaces table.<br />+ &#96;&#96;kafka:broker-storage:VolumeSize&#96;&#96; - The provisioned volume size (in GiB) for brokers in an Amazon MSK cluster.<br />+ &#96;&#96;elasticache:cache-cluster:Nodes&#96;&#96; - The number of nodes for an Amazon ElastiCache cache cluster.<br />+ &#96;&#96;elasticache:replication-group:NodeGroups&#96;&#96; - The number of node groups for an Amazon ElastiCache replication group.<br />+ &#96;&#96;elasticache:replication-group:Replicas&#96;&#96; - The number of replicas per node group for an Amazon ElastiCache replication group.<br />+ &#96;&#96;neptune:cluster:ReadReplicaCount&#96;&#96; - The count of read replicas in an Amazon Neptune DB cluster.<br />+ &#96;&#96;sagemaker:variant:DesiredProvisionedConcurrency&#96;&#96; - The provisioned concurrency for a SageMaker serverless endpoint.<br />+ &#96;&#96;sagemaker:inference-component:DesiredCopyCount&#96;&#96; - The number of copies across an endpoint for a SageMaker inference component.<br />+ &#96;&#96;workspaces:workspacespool:DesiredUserSessions&#96;&#96; - The number of user sessions for the WorkSpaces in the pool."
-  },
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>scaling_policies</code> in a region.
-```sql
-SELECT
-region,
-arn,
-scalable_dimension
-FROM awscc.applicationautoscaling.scaling_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>scaling_policies_list_only</code> resource, see <a href="/services/applicationautoscaling/scaling_policies/#permissions"><code>scaling_policies</code></a>
-
diff --git a/website/docs/services/applicationinsights/applications/index.md b/website/docs/services/applicationinsights/applications/index.md
index c9f83449c..805b965eb 100644
--- a/website/docs/services/applicationinsights/applications/index.md
+++ b/website/docs/services/applicationinsights/applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "resource_group_name",
@@ -261,6 +270,23 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_arn",
+    "type": "string",
+    "description": "The ARN of the ApplicationInsights application."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationinsights-application.html"><code>AWS::ApplicationInsights::Application</code></a>.
 
@@ -270,31 +296,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResourceGroupName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -303,6 +335,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application</code>.
 ```sql
 SELECT
@@ -323,6 +364,19 @@ attach_missing_permission
 FROM awscc.applicationinsights.applications
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationARN>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>applications</code> in a region.
+```sql
+SELECT
+region,
+application_arn
+FROM awscc.applicationinsights.applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -496,6 +550,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.applicationinsights.applications
+SET data__PatchDocument = string('{{ {
+    "CWEMonitorEnabled": cwe_monitor_enabled,
+    "OpsCenterEnabled": ops_center_enabled,
+    "OpsItemSNSTopicArn": ops_item_sns_topic_arn,
+    "SNSNotificationArn": sns_notification_arn,
+    "Tags": tags,
+    "CustomComponents": custom_components,
+    "LogPatternSets": log_pattern_sets,
+    "AutoConfigurationEnabled": auto_configuration_enabled,
+    "ComponentMonitoringSettings": component_monitoring_settings,
+    "AttachMissingPermission": attach_missing_permission
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationARN>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/applicationinsights/applications_list_only/index.md b/website/docs/services/applicationinsights/applications_list_only/index.md
deleted file mode 100644
index 51a66016b..000000000
--- a/website/docs/services/applicationinsights/applications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - applications_list_only
-  - applicationinsights
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>applications</code> in a region or regions, for all properties use <a href="/services/applicationinsights/applications/"><code>applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ApplicationInsights::Application</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.applicationinsights.applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_arn",
-    "type": "string",
-    "description": "The ARN of the ApplicationInsights application."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>applications</code> in a region.
-```sql
-SELECT
-region,
-application_arn
-FROM awscc.applicationinsights.applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>applications_list_only</code> resource, see <a href="/services/applicationinsights/applications/#permissions"><code>applications</code></a>
-
diff --git a/website/docs/services/applicationinsights/index.md b/website/docs/services/applicationinsights/index.md
index 2c832a5c6..6b9d92d02 100644
--- a/website/docs/services/applicationinsights/index.md
+++ b/website/docs/services/applicationinsights/index.md
@@ -20,7 +20,7 @@ The applicationinsights service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The applicationinsights service documentation.
 <a href="/services/applicationinsights/applications/">applications</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/applicationinsights/applications_list_only/">applications_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/applicationsignals/discoveries/index.md b/website/docs/services/applicationsignals/discoveries/index.md
index 7976c9774..d32f4282d 100644
--- a/website/docs/services/applicationsignals/discoveries/index.md
+++ b/website/docs/services/applicationsignals/discoveries/index.md
@@ -33,6 +33,30 @@ Creates, updates, deletes or gets a <code>discovery</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "account_id",
+    "type": "string",
+    "description": "The identifier for the specified AWS account."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "account_id",
@@ -45,6 +69,8 @@ Creates, updates, deletes or gets a <code>discovery</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationsignals-discovery.html"><code>AWS::ApplicationSignals::Discovery</code></a>.
 
@@ -54,31 +80,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>discoveries</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>discoveries</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>discoveries</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>discoveries_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>discoveries</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +119,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>discovery</code>.
 ```sql
 SELECT
@@ -95,6 +136,19 @@ account_id
 FROM awscc.applicationsignals.discoveries
 WHERE region = 'us-east-1' AND data__Identifier = '<AccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>discoveries</code> in a region.
+```sql
+SELECT
+region,
+account_id
+FROM awscc.applicationsignals.discoveries_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -153,6 +207,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/applicationsignals/discoveries_list_only/index.md b/website/docs/services/applicationsignals/discoveries_list_only/index.md
deleted file mode 100644
index 64f9bf437..000000000
--- a/website/docs/services/applicationsignals/discoveries_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: discoveries_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - discoveries_list_only
-  - applicationsignals
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>discoveries</code> in a region or regions, for all properties use <a href="/services/applicationsignals/discoveries/"><code>discoveries</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>discoveries_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ApplicationSignals::Discovery</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.applicationsignals.discoveries_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "account_id",
-    "type": "string",
-    "description": "The identifier for the specified AWS account."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>discoveries</code> in a region.
-```sql
-SELECT
-region,
-account_id
-FROM awscc.applicationsignals.discoveries_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>discoveries_list_only</code> resource, see <a href="/services/applicationsignals/discoveries/#permissions"><code>discoveries</code></a>
-
diff --git a/website/docs/services/applicationsignals/index.md b/website/docs/services/applicationsignals/index.md
index e74142866..e505a3e33 100644
--- a/website/docs/services/applicationsignals/index.md
+++ b/website/docs/services/applicationsignals/index.md
@@ -20,7 +20,7 @@ The applicationsignals service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The applicationsignals service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/applicationsignals/discoveries/">discoveries</a><br />
-<a href="/services/applicationsignals/discoveries_list_only/">discoveries_list_only</a>
+<a href="/services/applicationsignals/discoveries/">discoveries</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/applicationsignals/service_level_objectives/">service_level_objectives</a><br />
-<a href="/services/applicationsignals/service_level_objectives_list_only/">service_level_objectives_list_only</a>
+<a href="/services/applicationsignals/service_level_objectives/">service_level_objectives</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/applicationsignals/service_level_objectives/index.md b/website/docs/services/applicationsignals/service_level_objectives/index.md
index 18f9fc30a..35a5d77d8 100644
--- a/website/docs/services/applicationsignals/service_level_objectives/index.md
+++ b/website/docs/services/applicationsignals/service_level_objectives/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>service_level_objective</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -399,6 +408,23 @@ Creates, updates, deletes or gets a <code>service_level_objective</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The ARN of this SLO."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationsignals-servicelevelobjective.html"><code>AWS::ApplicationSignals::ServiceLevelObjective</code></a>.
 
@@ -408,31 +434,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>service_level_objectives</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>service_level_objectives</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>service_level_objectives</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>service_level_objectives_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>service_level_objectives</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -441,6 +473,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>service_level_objective</code>.
 ```sql
 SELECT
@@ -460,6 +501,19 @@ exclusion_windows
 FROM awscc.applicationsignals.service_level_objectives
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>service_level_objectives</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.applicationsignals.service_level_objectives_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -605,6 +659,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.applicationsignals.service_level_objectives
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Sli": sli,
+    "RequestBasedSli": request_based_sli,
+    "Goal": goal,
+    "Tags": tags,
+    "BurnRateConfigurations": burn_rate_configurations,
+    "ExclusionWindows": exclusion_windows
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/applicationsignals/service_level_objectives_list_only/index.md b/website/docs/services/applicationsignals/service_level_objectives_list_only/index.md
deleted file mode 100644
index 49a3c1003..000000000
--- a/website/docs/services/applicationsignals/service_level_objectives_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: service_level_objectives_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - service_level_objectives_list_only
-  - applicationsignals
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>service_level_objectives</code> in a region or regions, for all properties use <a href="/services/applicationsignals/service_level_objectives/"><code>service_level_objectives</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>service_level_objectives_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ApplicationSignals::ServiceLevelObjective</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.applicationsignals.service_level_objectives_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The ARN of this SLO."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>service_level_objectives</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.applicationsignals.service_level_objectives_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>service_level_objectives_list_only</code> resource, see <a href="/services/applicationsignals/service_level_objectives/#permissions"><code>service_level_objectives</code></a>
-
diff --git a/website/docs/services/apprunner/auto_scaling_configurations/index.md b/website/docs/services/apprunner/auto_scaling_configurations/index.md
index 742190c20..3c3619df5 100644
--- a/website/docs/services/apprunner/auto_scaling_configurations/index.md
+++ b/website/docs/services/apprunner/auto_scaling_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>auto_scaling_configuration</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "auto_scaling_configuration_arn",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets an <code>auto_scaling_configuration</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "auto_scaling_configuration_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of this auto scaling configuration."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-autoscalingconfiguration.html"><code>AWS::AppRunner::AutoScalingConfiguration</code></a>.
 
@@ -101,26 +127,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>auto_scaling_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>auto_scaling_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>auto_scaling_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>auto_scaling_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +160,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>auto_scaling_configuration</code>.
 ```sql
 SELECT
@@ -144,6 +184,19 @@ tags
 FROM awscc.apprunner.auto_scaling_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<AutoScalingConfigurationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>auto_scaling_configurations</code> in a region.
+```sql
+SELECT
+region,
+auto_scaling_configuration_arn
+FROM awscc.apprunner.auto_scaling_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -230,6 +283,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apprunner/auto_scaling_configurations_list_only/index.md b/website/docs/services/apprunner/auto_scaling_configurations_list_only/index.md
deleted file mode 100644
index 5f942450d..000000000
--- a/website/docs/services/apprunner/auto_scaling_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: auto_scaling_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - auto_scaling_configurations_list_only
-  - apprunner
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>auto_scaling_configurations</code> in a region or regions, for all properties use <a href="/services/apprunner/auto_scaling_configurations/"><code>auto_scaling_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>auto_scaling_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Describes an AWS App Runner automatic configuration resource that enables automatic scaling of instances used to process web requests. You can share an auto scaling configuration across multiple services.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apprunner.auto_scaling_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "auto_scaling_configuration_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of this auto scaling configuration."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>auto_scaling_configurations</code> in a region.
-```sql
-SELECT
-region,
-auto_scaling_configuration_arn
-FROM awscc.apprunner.auto_scaling_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>auto_scaling_configurations_list_only</code> resource, see <a href="/services/apprunner/auto_scaling_configurations/#permissions"><code>auto_scaling_configurations</code></a>
-
diff --git a/website/docs/services/apprunner/index.md b/website/docs/services/apprunner/index.md
index 4f774aca2..1173ec8fd 100644
--- a/website/docs/services/apprunner/index.md
+++ b/website/docs/services/apprunner/index.md
@@ -20,7 +20,7 @@ The apprunner service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>10</b></span><br />
+<span>total resources:&nbsp;<b>5</b></span><br />
 </div>
 </div>
 
@@ -30,16 +30,11 @@ The apprunner service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/apprunner/auto_scaling_configurations/">auto_scaling_configurations</a><br />
-<a href="/services/apprunner/auto_scaling_configurations_list_only/">auto_scaling_configurations_list_only</a><br />
 <a href="/services/apprunner/observability_configurations/">observability_configurations</a><br />
-<a href="/services/apprunner/observability_configurations_list_only/">observability_configurations_list_only</a><br />
 <a href="/services/apprunner/services/">services</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/apprunner/services_list_only/">services_list_only</a><br />
 <a href="/services/apprunner/vpc_connectors/">vpc_connectors</a><br />
-<a href="/services/apprunner/vpc_connectors_list_only/">vpc_connectors_list_only</a><br />
-<a href="/services/apprunner/vpc_ingress_connections/">vpc_ingress_connections</a><br />
-<a href="/services/apprunner/vpc_ingress_connections_list_only/">vpc_ingress_connections_list_only</a>
+<a href="/services/apprunner/vpc_ingress_connections/">vpc_ingress_connections</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/apprunner/observability_configurations/index.md b/website/docs/services/apprunner/observability_configurations/index.md
index 189c8c31e..df05ffc12 100644
--- a/website/docs/services/apprunner/observability_configurations/index.md
+++ b/website/docs/services/apprunner/observability_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>observability_configuration</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "observability_configuration_arn",
@@ -89,6 +98,23 @@ Creates, updates, deletes or gets an <code>observability_configuration</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "observability_configuration_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of this ObservabilityConfiguration"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-observabilityconfiguration.html"><code>AWS::AppRunner::ObservabilityConfiguration</code></a>.
 
@@ -98,26 +124,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>observability_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>observability_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>observability_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>observability_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -126,6 +157,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>observability_configuration</code>.
 ```sql
 SELECT
@@ -139,6 +179,19 @@ tags
 FROM awscc.apprunner.observability_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<ObservabilityConfigurationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>observability_configurations</code> in a region.
+```sql
+SELECT
+region,
+observability_configuration_arn
+FROM awscc.apprunner.observability_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -210,6 +263,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apprunner/observability_configurations_list_only/index.md b/website/docs/services/apprunner/observability_configurations_list_only/index.md
deleted file mode 100644
index 71b19040d..000000000
--- a/website/docs/services/apprunner/observability_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: observability_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - observability_configurations_list_only
-  - apprunner
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>observability_configurations</code> in a region or regions, for all properties use <a href="/services/apprunner/observability_configurations/"><code>observability_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>observability_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::AppRunner::ObservabilityConfiguration resource is an AWS App Runner resource type that specifies an App Runner observability configuration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apprunner.observability_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "observability_configuration_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of this ObservabilityConfiguration"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>observability_configurations</code> in a region.
-```sql
-SELECT
-region,
-observability_configuration_arn
-FROM awscc.apprunner.observability_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>observability_configurations_list_only</code> resource, see <a href="/services/apprunner/observability_configurations/#permissions"><code>observability_configurations</code></a>
-
diff --git a/website/docs/services/apprunner/services/index.md b/website/docs/services/apprunner/services/index.md
index 0a3103710..84528554e 100644
--- a/website/docs/services/apprunner/services/index.md
+++ b/website/docs/services/apprunner/services/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>service</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "service_name",
@@ -340,6 +349,23 @@ Creates, updates, deletes or gets a <code>service</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "service_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the AppRunner Service."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-service.html"><code>AWS::AppRunner::Service</code></a>.
 
@@ -349,31 +375,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>services</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SourceConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>services</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>services</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>services_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>services</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -382,6 +414,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>service</code>.
 ```sql
 SELECT
@@ -402,6 +443,19 @@ network_configuration
 FROM awscc.apprunner.services
 WHERE region = 'us-east-1' AND data__Identifier = '<ServiceArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>services</code> in a region.
+```sql
+SELECT
+region,
+service_arn
+FROM awscc.apprunner.services_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -546,6 +600,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apprunner.services
+SET data__PatchDocument = string('{{ {
+    "SourceConfiguration": source_configuration,
+    "InstanceConfiguration": instance_configuration,
+    "Tags": tags,
+    "HealthCheckConfiguration": health_check_configuration,
+    "ObservabilityConfiguration": observability_configuration,
+    "AutoScalingConfigurationArn": auto_scaling_configuration_arn,
+    "NetworkConfiguration": network_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ServiceArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apprunner/services_list_only/index.md b/website/docs/services/apprunner/services_list_only/index.md
deleted file mode 100644
index 34f2dba83..000000000
--- a/website/docs/services/apprunner/services_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: services_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - services_list_only
-  - apprunner
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>services</code> in a region or regions, for all properties use <a href="/services/apprunner/services/"><code>services</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>services_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::AppRunner::Service resource specifies an AppRunner Service.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apprunner.services_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "service_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the AppRunner Service."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>services</code> in a region.
-```sql
-SELECT
-region,
-service_arn
-FROM awscc.apprunner.services_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>services_list_only</code> resource, see <a href="/services/apprunner/services/#permissions"><code>services</code></a>
-
diff --git a/website/docs/services/apprunner/vpc_connectors/index.md b/website/docs/services/apprunner/vpc_connectors/index.md
index 0e1aa4cd2..fa5981ab6 100644
--- a/website/docs/services/apprunner/vpc_connectors/index.md
+++ b/website/docs/services/apprunner/vpc_connectors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_connector</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "vpc_connector_name",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>vpc_connector</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "vpc_connector_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of this VPC connector."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-vpcconnector.html"><code>AWS::AppRunner::VpcConnector</code></a>.
 
@@ -91,26 +117,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_connectors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Subnets, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_connectors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_connectors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_connectors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +150,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_connector</code>.
 ```sql
 SELECT
@@ -132,6 +172,19 @@ tags
 FROM awscc.apprunner.vpc_connectors
 WHERE region = 'us-east-1' AND data__Identifier = '<VpcConnectorArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_connectors</code> in a region.
+```sql
+SELECT
+region,
+vpc_connector_arn
+FROM awscc.apprunner.vpc_connectors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -208,6 +261,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apprunner/vpc_connectors_list_only/index.md b/website/docs/services/apprunner/vpc_connectors_list_only/index.md
deleted file mode 100644
index ed1483b40..000000000
--- a/website/docs/services/apprunner/vpc_connectors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpc_connectors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_connectors_list_only
-  - apprunner
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_connectors</code> in a region or regions, for all properties use <a href="/services/apprunner/vpc_connectors/"><code>vpc_connectors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_connectors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::AppRunner::VpcConnector resource specifies an App Runner VpcConnector.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apprunner.vpc_connectors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "vpc_connector_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of this VPC connector."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_connectors</code> in a region.
-```sql
-SELECT
-region,
-vpc_connector_arn
-FROM awscc.apprunner.vpc_connectors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_connectors_list_only</code> resource, see <a href="/services/apprunner/vpc_connectors/#permissions"><code>vpc_connectors</code></a>
-
diff --git a/website/docs/services/apprunner/vpc_ingress_connections/index.md b/website/docs/services/apprunner/vpc_ingress_connections/index.md
index 420cf0c49..63c5f80ba 100644
--- a/website/docs/services/apprunner/vpc_ingress_connections/index.md
+++ b/website/docs/services/apprunner/vpc_ingress_connections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_ingress_connection</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "vpc_ingress_connection_arn",
@@ -99,6 +108,23 @@ Creates, updates, deletes or gets a <code>vpc_ingress_connection</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "vpc_ingress_connection_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the VpcIngressConnection."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-vpcingressconnection.html"><code>AWS::AppRunner::VpcIngressConnection</code></a>.
 
@@ -108,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_ingress_connections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ServiceArn, IngressVpcConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_ingress_connections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_ingress_connections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_ingress_connections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_ingress_connections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_ingress_connection</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ tags
 FROM awscc.apprunner.vpc_ingress_connections
 WHERE region = 'us-east-1' AND data__Identifier = '<VpcIngressConnectionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_ingress_connections</code> in a region.
+```sql
+SELECT
+region,
+vpc_ingress_connection_arn
+FROM awscc.apprunner.vpc_ingress_connections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -233,6 +287,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apprunner.vpc_ingress_connections
+SET data__PatchDocument = string('{{ {
+    "IngressVpcConfiguration": ingress_vpc_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<VpcIngressConnectionArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apprunner/vpc_ingress_connections_list_only/index.md b/website/docs/services/apprunner/vpc_ingress_connections_list_only/index.md
deleted file mode 100644
index ff421135c..000000000
--- a/website/docs/services/apprunner/vpc_ingress_connections_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpc_ingress_connections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_ingress_connections_list_only
-  - apprunner
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_ingress_connections</code> in a region or regions, for all properties use <a href="/services/apprunner/vpc_ingress_connections/"><code>vpc_ingress_connections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_ingress_connections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::AppRunner::VpcIngressConnection resource is an App Runner resource that specifies an App Runner VpcIngressConnection.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apprunner.vpc_ingress_connections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "vpc_ingress_connection_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the VpcIngressConnection."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_ingress_connections</code> in a region.
-```sql
-SELECT
-region,
-vpc_ingress_connection_arn
-FROM awscc.apprunner.vpc_ingress_connections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_ingress_connections_list_only</code> resource, see <a href="/services/apprunner/vpc_ingress_connections/#permissions"><code>vpc_ingress_connections</code></a>
-
diff --git a/website/docs/services/appstream/app_block_builders/index.md b/website/docs/services/appstream/app_block_builders/index.md
index e7d325a55..6cf4bcb86 100644
--- a/website/docs/services/appstream/app_block_builders/index.md
+++ b/website/docs/services/appstream/app_block_builders/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>app_block_builder</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -141,6 +150,23 @@ Creates, updates, deletes or gets an <code>app_block_builder</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblockbuilder.html"><code>AWS::AppStream::AppBlockBuilder</code></a>.
 
@@ -150,31 +176,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>app_block_builders</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Platform, InstanceType, VpcConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>app_block_builders</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>app_block_builders</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>app_block_builders_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>app_block_builders</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -183,6 +215,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>app_block_builder</code>.
 ```sql
 SELECT
@@ -203,6 +244,19 @@ app_block_arns
 FROM awscc.appstream.app_block_builders
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>app_block_builders</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.appstream.app_block_builders_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -318,6 +372,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appstream.app_block_builders
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "DisplayName": display_name,
+    "Platform": platform,
+    "AccessEndpoints": access_endpoints,
+    "Tags": tags,
+    "VpcConfig": vpc_config,
+    "EnableDefaultInternetAccess": enable_default_internet_access,
+    "IamRoleArn": iam_role_arn,
+    "InstanceType": instance_type,
+    "AppBlockArns": app_block_arns
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appstream/app_block_builders_list_only/index.md b/website/docs/services/appstream/app_block_builders_list_only/index.md
deleted file mode 100644
index b12d742e1..000000000
--- a/website/docs/services/appstream/app_block_builders_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: app_block_builders_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - app_block_builders_list_only
-  - appstream
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>app_block_builders</code> in a region or regions, for all properties use <a href="/services/appstream/app_block_builders/"><code>app_block_builders</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>app_block_builders_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppStream::AppBlockBuilder.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appstream.app_block_builders_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>app_block_builders</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.appstream.app_block_builders_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>app_block_builders_list_only</code> resource, see <a href="/services/appstream/app_block_builders/#permissions"><code>app_block_builders</code></a>
-
diff --git a/website/docs/services/appstream/app_blocks/index.md b/website/docs/services/appstream/app_blocks/index.md
index b11704835..716acdc12 100644
--- a/website/docs/services/appstream/app_blocks/index.md
+++ b/website/docs/services/appstream/app_blocks/index.md
@@ -278,6 +278,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appstream.app_blocks
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appstream/application_entitlement_associations/index.md b/website/docs/services/appstream/application_entitlement_associations/index.md
index 6b4b52c65..3bf56b92c 100644
--- a/website/docs/services/appstream/application_entitlement_associations/index.md
+++ b/website/docs/services/appstream/application_entitlement_associations/index.md
@@ -169,6 +169,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appstream/application_fleet_associations/index.md b/website/docs/services/appstream/application_fleet_associations/index.md
index b2efd809c..b04c33577 100644
--- a/website/docs/services/appstream/application_fleet_associations/index.md
+++ b/website/docs/services/appstream/application_fleet_associations/index.md
@@ -157,6 +157,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appstream/applications/index.md b/website/docs/services/appstream/applications/index.md
index 19a7cf7d8..72ba900c5 100644
--- a/website/docs/services/appstream/applications/index.md
+++ b/website/docs/services/appstream/applications/index.md
@@ -308,6 +308,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appstream.applications
+SET data__PatchDocument = string('{{ {
+    "DisplayName": display_name,
+    "Description": description,
+    "LaunchPath": launch_path,
+    "LaunchParameters": launch_parameters,
+    "WorkingDirectory": working_directory,
+    "IconS3Location": icon_s3_location,
+    "AppBlockArn": app_block_arn,
+    "Tags": tags,
+    "AttributesToDelete": attributes_to_delete
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appstream/directory_configs/index.md b/website/docs/services/appstream/directory_configs/index.md
index 70ff48071..aa594b23f 100644
--- a/website/docs/services/appstream/directory_configs/index.md
+++ b/website/docs/services/appstream/directory_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>directory_config</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "organizational_unit_distinguished_names",
@@ -84,6 +93,23 @@ Creates, updates, deletes or gets a <code>directory_config</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "directory_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-directoryconfig.html"><code>AWS::AppStream::DirectoryConfig</code></a>.
 
@@ -93,31 +119,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>directory_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DirectoryName, OrganizationalUnitDistinguishedNames, ServiceAccountCredentials, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>directory_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>directory_configs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>directory_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>directory_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -126,6 +158,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>directory_config</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ certificate_based_auth_properties
 FROM awscc.appstream.directory_configs
 WHERE region = 'us-east-1' AND data__Identifier = '<DirectoryName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>directory_configs</code> in a region.
+```sql
+SELECT
+region,
+directory_name
+FROM awscc.appstream.directory_configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -218,6 +272,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appstream.directory_configs
+SET data__PatchDocument = string('{{ {
+    "OrganizationalUnitDistinguishedNames": organizational_unit_distinguished_names,
+    "ServiceAccountCredentials": service_account_credentials,
+    "CertificateBasedAuthProperties": certificate_based_auth_properties
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DirectoryName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appstream/directory_configs_list_only/index.md b/website/docs/services/appstream/directory_configs_list_only/index.md
deleted file mode 100644
index 3a2f7fe7b..000000000
--- a/website/docs/services/appstream/directory_configs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: directory_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - directory_configs_list_only
-  - appstream
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>directory_configs</code> in a region or regions, for all properties use <a href="/services/appstream/directory_configs/"><code>directory_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>directory_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppStream::DirectoryConfig</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appstream.directory_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "directory_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>directory_configs</code> in a region.
-```sql
-SELECT
-region,
-directory_name
-FROM awscc.appstream.directory_configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>directory_configs_list_only</code> resource, see <a href="/services/appstream/directory_configs/#permissions"><code>directory_configs</code></a>
-
diff --git a/website/docs/services/appstream/entitlements/index.md b/website/docs/services/appstream/entitlements/index.md
index 6a4207b3d..0e33a22d7 100644
--- a/website/docs/services/appstream/entitlements/index.md
+++ b/website/docs/services/appstream/entitlements/index.md
@@ -222,6 +222,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appstream.entitlements
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "AppVisibility": app_visibility,
+    "Attributes": attributes
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<StackName>|<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appstream/image_builders/index.md b/website/docs/services/appstream/image_builders/index.md
index 8ea2d2471..9fe24f293 100644
--- a/website/docs/services/appstream/image_builders/index.md
+++ b/website/docs/services/appstream/image_builders/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>image_builder</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -158,6 +167,23 @@ Creates, updates, deletes or gets an <code>image_builder</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html"><code>AWS::AppStream::ImageBuilder</code></a>.
 
@@ -167,26 +193,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>image_builders</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceType, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>image_builders</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>image_builders_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>image_builders</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -195,6 +226,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>image_builder</code>.
 ```sql
 SELECT
@@ -216,6 +256,19 @@ access_endpoints
 FROM awscc.appstream.image_builders
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>image_builders</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.appstream.image_builders_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -336,6 +389,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appstream/image_builders_list_only/index.md b/website/docs/services/appstream/image_builders_list_only/index.md
deleted file mode 100644
index 65bb7aec6..000000000
--- a/website/docs/services/appstream/image_builders_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: image_builders_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - image_builders_list_only
-  - appstream
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>image_builders</code> in a region or regions, for all properties use <a href="/services/appstream/image_builders/"><code>image_builders</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>image_builders_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppStream::ImageBuilder</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appstream.image_builders_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>image_builders</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.appstream.image_builders_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>image_builders_list_only</code> resource, see <a href="/services/appstream/image_builders/#permissions"><code>image_builders</code></a>
-
diff --git a/website/docs/services/appstream/index.md b/website/docs/services/appstream/index.md
index 4e53ca194..b6780c0c8 100644
--- a/website/docs/services/appstream/index.md
+++ b/website/docs/services/appstream/index.md
@@ -20,7 +20,7 @@ The appstream service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>11</b></span><br />
+<span>total resources:&nbsp;<b>8</b></span><br />
 </div>
 </div>
 
@@ -30,17 +30,14 @@ The appstream service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/appstream/app_block_builders/">app_block_builders</a><br />
-<a href="/services/appstream/app_block_builders_list_only/">app_block_builders_list_only</a><br />
 <a href="/services/appstream/app_blocks/">app_blocks</a><br />
 <a href="/services/appstream/application_entitlement_associations/">application_entitlement_associations</a><br />
-<a href="/services/appstream/application_fleet_associations/">application_fleet_associations</a><br />
-<a href="/services/appstream/applications/">applications</a>
+<a href="/services/appstream/application_fleet_associations/">application_fleet_associations</a>
 </div>
 <div class="providerDocColumn">
+<a href="/services/appstream/applications/">applications</a><br />
 <a href="/services/appstream/directory_configs/">directory_configs</a><br />
-<a href="/services/appstream/directory_configs_list_only/">directory_configs_list_only</a><br />
 <a href="/services/appstream/entitlements/">entitlements</a><br />
-<a href="/services/appstream/image_builders/">image_builders</a><br />
-<a href="/services/appstream/image_builders_list_only/">image_builders_list_only</a>
+<a href="/services/appstream/image_builders/">image_builders</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/appsync/apis/index.md b/website/docs/services/appsync/apis/index.md
index fac5f841a..ac31fdca1 100644
--- a/website/docs/services/appsync/apis/index.md
+++ b/website/docs/services/appsync/apis/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>api</code> resource or lists <code>ap
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "api_id",
@@ -213,6 +222,23 @@ Creates, updates, deletes or gets an <code>api</code> resource or lists <code>ap
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "api_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the AppSync Api"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-api.html"><code>AWS::AppSync::Api</code></a>.
 
@@ -222,31 +248,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>apis</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>apis</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>apis</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>apis_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>apis</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -255,6 +287,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>api</code>.
 ```sql
 SELECT
@@ -269,6 +310,19 @@ tags
 FROM awscc.appsync.apis
 WHERE region = 'us-east-1' AND data__Identifier = '<ApiArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>apis</code> in a region.
+```sql
+SELECT
+region,
+api_arn
+FROM awscc.appsync.apis_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -365,6 +419,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appsync.apis
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "OwnerContact": owner_contact,
+    "EventConfig": event_config,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApiArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appsync/apis_list_only/index.md b/website/docs/services/appsync/apis_list_only/index.md
deleted file mode 100644
index 6dc3a523b..000000000
--- a/website/docs/services/appsync/apis_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: apis_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - apis_list_only
-  - appsync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>apis</code> in a region or regions, for all properties use <a href="/services/appsync/apis/"><code>apis</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>apis_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AppSync Api</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appsync.apis_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "api_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the AppSync Api"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>apis</code> in a region.
-```sql
-SELECT
-region,
-api_arn
-FROM awscc.appsync.apis_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>apis_list_only</code> resource, see <a href="/services/appsync/apis/#permissions"><code>apis</code></a>
-
diff --git a/website/docs/services/appsync/channel_namespaces/index.md b/website/docs/services/appsync/channel_namespaces/index.md
index d142d3b04..690d715a1 100644
--- a/website/docs/services/appsync/channel_namespaces/index.md
+++ b/website/docs/services/appsync/channel_namespaces/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>channel_namespace</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "api_id",
@@ -130,6 +139,28 @@ Creates, updates, deletes or gets a <code>channel_namespace</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Namespace indentifier."
+  },
+  {
+    "name": "channel_namespace_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) for the Channel Namespace."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-channelnamespace.html"><code>AWS::AppSync::ChannelNamespace</code></a>.
 
@@ -139,31 +170,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>channel_namespaces</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApiId, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>channel_namespaces</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>channel_namespaces</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>channel_namespaces_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>channel_namespaces</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -172,6 +209,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>channel_namespace</code>.
 ```sql
 SELECT
@@ -188,6 +234,19 @@ handler_configs
 FROM awscc.appsync.channel_namespaces
 WHERE region = 'us-east-1' AND data__Identifier = '<ChannelNamespaceArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>channel_namespaces</code> in a region.
+```sql
+SELECT
+region,
+channel_namespace_arn
+FROM awscc.appsync.channel_namespaces_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -288,6 +347,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appsync.channel_namespaces
+SET data__PatchDocument = string('{{ {
+    "SubscribeAuthModes": subscribe_auth_modes,
+    "PublishAuthModes": publish_auth_modes,
+    "CodeHandlers": code_handlers,
+    "CodeS3Location": code_s3_location,
+    "Tags": tags,
+    "HandlerConfigs": handler_configs
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ChannelNamespaceArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appsync/channel_namespaces_list_only/index.md b/website/docs/services/appsync/channel_namespaces_list_only/index.md
deleted file mode 100644
index d544f3bfe..000000000
--- a/website/docs/services/appsync/channel_namespaces_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: channel_namespaces_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - channel_namespaces_list_only
-  - appsync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>channel_namespaces</code> in a region or regions, for all properties use <a href="/services/appsync/channel_namespaces/"><code>channel_namespaces</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>channel_namespaces_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AppSync ChannelNamespace</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appsync.channel_namespaces_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Namespace indentifier."
-  },
-  {
-    "name": "channel_namespace_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) for the Channel Namespace."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>channel_namespaces</code> in a region.
-```sql
-SELECT
-region,
-channel_namespace_arn
-FROM awscc.appsync.channel_namespaces_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>channel_namespaces_list_only</code> resource, see <a href="/services/appsync/channel_namespaces/#permissions"><code>channel_namespaces</code></a>
-
diff --git a/website/docs/services/appsync/data_sources/index.md b/website/docs/services/appsync/data_sources/index.md
index 7e6eb6b62..8505374f6 100644
--- a/website/docs/services/appsync/data_sources/index.md
+++ b/website/docs/services/appsync/data_sources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "api_id",
@@ -267,6 +276,23 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "data_source_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the API key, such as arn:aws:appsync:us-east-1:123456789012:apis/graphqlapiid/datasources/datasourcename."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-datasource.html"><code>AWS::AppSync::DataSource</code></a>.
 
@@ -276,31 +302,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, ApiId, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_sources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -309,6 +341,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_source</code>.
 ```sql
 SELECT
@@ -330,6 +371,19 @@ metrics_config
 FROM awscc.appsync.data_sources
 WHERE region = 'us-east-1' AND data__Identifier = '<DataSourceArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_sources</code> in a region.
+```sql
+SELECT
+region,
+data_source_arn
+FROM awscc.appsync.data_sources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -469,6 +523,29 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appsync.data_sources
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "DynamoDBConfig": dynamo_db_config,
+    "ElasticsearchConfig": elasticsearch_config,
+    "EventBridgeConfig": event_bridge_config,
+    "HttpConfig": http_config,
+    "LambdaConfig": lambda_config,
+    "OpenSearchServiceConfig": open_search_service_config,
+    "RelationalDatabaseConfig": relational_database_config,
+    "ServiceRoleArn": service_role_arn,
+    "Type": type,
+    "MetricsConfig": metrics_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DataSourceArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appsync/data_sources_list_only/index.md b/website/docs/services/appsync/data_sources_list_only/index.md
deleted file mode 100644
index 98d87e151..000000000
--- a/website/docs/services/appsync/data_sources_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: data_sources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_sources_list_only
-  - appsync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_sources</code> in a region or regions, for all properties use <a href="/services/appsync/data_sources/"><code>data_sources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_sources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppSync::DataSource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appsync.data_sources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "data_source_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the API key, such as arn:aws:appsync:us-east-1:123456789012:apis/graphqlapiid/datasources/datasourcename."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_sources</code> in a region.
-```sql
-SELECT
-region,
-data_source_arn
-FROM awscc.appsync.data_sources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_sources_list_only</code> resource, see <a href="/services/appsync/data_sources/#permissions"><code>data_sources</code></a>
-
diff --git a/website/docs/services/appsync/domain_name_api_associations/index.md b/website/docs/services/appsync/domain_name_api_associations/index.md
index 6b58aeeef..1619e4ae2 100644
--- a/website/docs/services/appsync/domain_name_api_associations/index.md
+++ b/website/docs/services/appsync/domain_name_api_associations/index.md
@@ -168,6 +168,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appsync.domain_name_api_associations
+SET data__PatchDocument = string('{{ {
+    "ApiId": api_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApiAssociationIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appsync/domain_names/index.md b/website/docs/services/appsync/domain_names/index.md
index 238a40e4c..07b2ae7dd 100644
--- a/website/docs/services/appsync/domain_names/index.md
+++ b/website/docs/services/appsync/domain_names/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>domain_name</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain_name",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>domain_name</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-domainname.html"><code>AWS::AppSync::DomainName</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>domain_names</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainName, CertificateArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>domain_names</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>domain_names</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>domain_names_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>domain_names</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>domain_name</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.appsync.domain_names
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>domain_names</code> in a region.
+```sql
+SELECT
+region,
+domain_name
+FROM awscc.appsync.domain_names_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appsync.domain_names
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appsync/domain_names_list_only/index.md b/website/docs/services/appsync/domain_names_list_only/index.md
deleted file mode 100644
index 730a0263b..000000000
--- a/website/docs/services/appsync/domain_names_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: domain_names_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - domain_names_list_only
-  - appsync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>domain_names</code> in a region or regions, for all properties use <a href="/services/appsync/domain_names/"><code>domain_names</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>domain_names_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppSync::DomainName</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appsync.domain_names_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>domain_names</code> in a region.
-```sql
-SELECT
-region,
-domain_name
-FROM awscc.appsync.domain_names_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>domain_names_list_only</code> resource, see <a href="/services/appsync/domain_names/#permissions"><code>domain_names</code></a>
-
diff --git a/website/docs/services/appsync/function_configurations/index.md b/website/docs/services/appsync/function_configurations/index.md
index 01c9ebf45..67530bb28 100644
--- a/website/docs/services/appsync/function_configurations/index.md
+++ b/website/docs/services/appsync/function_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>function_configuration</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "function_id",
@@ -156,6 +165,23 @@ Creates, updates, deletes or gets a <code>function_configuration</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "function_arn",
+    "type": "string",
+    "description": "The ARN for the function generated by the service"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-functionconfiguration.html"><code>AWS::AppSync::FunctionConfiguration</code></a>.
 
@@ -165,31 +191,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>function_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApiId, DataSourceName, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>function_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>function_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>function_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>function_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -198,6 +230,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>function_configuration</code>.
 ```sql
 SELECT
@@ -221,6 +262,19 @@ sync_config
 FROM awscc.appsync.function_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<FunctionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>function_configurations</code> in a region.
+```sql
+SELECT
+region,
+function_arn
+FROM awscc.appsync.function_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -343,6 +397,31 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appsync.function_configurations
+SET data__PatchDocument = string('{{ {
+    "Code": code,
+    "CodeS3Location": code_s3_location,
+    "DataSourceName": data_source_name,
+    "Description": description,
+    "FunctionVersion": function_version,
+    "MaxBatchSize": max_batch_size,
+    "Name": name,
+    "RequestMappingTemplate": request_mapping_template,
+    "RequestMappingTemplateS3Location": request_mapping_template_s3_location,
+    "ResponseMappingTemplate": response_mapping_template,
+    "ResponseMappingTemplateS3Location": response_mapping_template_s3_location,
+    "Runtime": runtime,
+    "SyncConfig": sync_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FunctionArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appsync/function_configurations_list_only/index.md b/website/docs/services/appsync/function_configurations_list_only/index.md
deleted file mode 100644
index f315de771..000000000
--- a/website/docs/services/appsync/function_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: function_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - function_configurations_list_only
-  - appsync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>function_configurations</code> in a region or regions, for all properties use <a href="/services/appsync/function_configurations/"><code>function_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>function_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An example resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appsync.function_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "function_arn",
-    "type": "string",
-    "description": "The ARN for the function generated by the service"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>function_configurations</code> in a region.
-```sql
-SELECT
-region,
-function_arn
-FROM awscc.appsync.function_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>function_configurations_list_only</code> resource, see <a href="/services/appsync/function_configurations/#permissions"><code>function_configurations</code></a>
-
diff --git a/website/docs/services/appsync/graphql_apis/index.md b/website/docs/services/appsync/graphql_apis/index.md
index 870e87b56..8329df5ff 100644
--- a/website/docs/services/appsync/graphql_apis/index.md
+++ b/website/docs/services/appsync/graphql_apis/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>graphql_api</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "additional_authentication_providers",
@@ -350,6 +359,23 @@ Creates, updates, deletes or gets a <code>graphql_api</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "api_id",
+    "type": "string",
+    "description": "Unique AWS AppSync GraphQL API identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlapi.html"><code>AWS::AppSync::GraphQLApi</code></a>.
 
@@ -359,31 +385,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>graphql_apis</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, AuthenticationType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>graphql_apis</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>graphql_apis</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>graphql_apis_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>graphql_apis</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -392,6 +424,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>graphql_api</code>.
 ```sql
 SELECT
@@ -424,6 +465,19 @@ xray_enabled
 FROM awscc.appsync.graphql_apis
 WHERE region = 'us-east-1' AND data__Identifier = '<ApiId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>graphql_apis</code> in a region.
+```sql
+SELECT
+region,
+api_id
+FROM awscc.appsync.graphql_apis_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -580,6 +634,36 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appsync.graphql_apis
+SET data__PatchDocument = string('{{ {
+    "AdditionalAuthenticationProviders": additional_authentication_providers,
+    "ApiType": api_type,
+    "AuthenticationType": authentication_type,
+    "EnhancedMetricsConfig": enhanced_metrics_config,
+    "EnvironmentVariables": environment_variables,
+    "IntrospectionConfig": introspection_config,
+    "LambdaAuthorizerConfig": lambda_authorizer_config,
+    "LogConfig": log_config,
+    "MergedApiExecutionRoleArn": merged_api_execution_role_arn,
+    "Name": name,
+    "OpenIDConnectConfig": open_id_connect_config,
+    "OwnerContact": owner_contact,
+    "QueryDepthLimit": query_depth_limit,
+    "ResolverCountLimit": resolver_count_limit,
+    "Tags": tags,
+    "UserPoolConfig": user_pool_config,
+    "Visibility": visibility,
+    "XrayEnabled": xray_enabled
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApiId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appsync/graphql_apis_list_only/index.md b/website/docs/services/appsync/graphql_apis_list_only/index.md
deleted file mode 100644
index 6ab297458..000000000
--- a/website/docs/services/appsync/graphql_apis_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: graphql_apis_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - graphql_apis_list_only
-  - appsync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>graphql_apis</code> in a region or regions, for all properties use <a href="/services/appsync/graphql_apis/"><code>graphql_apis</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>graphql_apis_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppSync::GraphQLApi</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appsync.graphql_apis_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "api_id",
-    "type": "string",
-    "description": "Unique AWS AppSync GraphQL API identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>graphql_apis</code> in a region.
-```sql
-SELECT
-region,
-api_id
-FROM awscc.appsync.graphql_apis_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>graphql_apis_list_only</code> resource, see <a href="/services/appsync/graphql_apis/#permissions"><code>graphql_apis</code></a>
-
diff --git a/website/docs/services/appsync/index.md b/website/docs/services/appsync/index.md
index 50a867853..aed1a4067 100644
--- a/website/docs/services/appsync/index.md
+++ b/website/docs/services/appsync/index.md
@@ -20,7 +20,7 @@ The appsync service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>17</b></span><br />
+<span>total resources:&nbsp;<b>9</b></span><br />
 </div>
 </div>
 
@@ -30,23 +30,15 @@ The appsync service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/appsync/apis/">apis</a><br />
-<a href="/services/appsync/apis_list_only/">apis_list_only</a><br />
 <a href="/services/appsync/channel_namespaces/">channel_namespaces</a><br />
-<a href="/services/appsync/channel_namespaces_list_only/">channel_namespaces_list_only</a><br />
 <a href="/services/appsync/data_sources/">data_sources</a><br />
-<a href="/services/appsync/data_sources_list_only/">data_sources_list_only</a><br />
 <a href="/services/appsync/domain_name_api_associations/">domain_name_api_associations</a><br />
-<a href="/services/appsync/domain_names/">domain_names</a><br />
-<a href="/services/appsync/domain_names_list_only/">domain_names_list_only</a>
+<a href="/services/appsync/domain_names/">domain_names</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/appsync/function_configurations/">function_configurations</a><br />
-<a href="/services/appsync/function_configurations_list_only/">function_configurations_list_only</a><br />
 <a href="/services/appsync/graphql_apis/">graphql_apis</a><br />
-<a href="/services/appsync/graphql_apis_list_only/">graphql_apis_list_only</a><br />
 <a href="/services/appsync/resolvers/">resolvers</a><br />
-<a href="/services/appsync/resolvers_list_only/">resolvers_list_only</a><br />
-<a href="/services/appsync/source_api_associations/">source_api_associations</a><br />
-<a href="/services/appsync/source_api_associations_list_only/">source_api_associations_list_only</a>
+<a href="/services/appsync/source_api_associations/">source_api_associations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/appsync/resolvers/index.md b/website/docs/services/appsync/resolvers/index.md
index e41b0f951..84e178e15 100644
--- a/website/docs/services/appsync/resolvers/index.md
+++ b/website/docs/services/appsync/resolvers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resolver</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "api_id",
@@ -185,6 +194,23 @@ Creates, updates, deletes or gets a <code>resolver</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "resolver_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-resolver.html"><code>AWS::AppSync::Resolver</code></a>.
 
@@ -194,31 +220,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resolvers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TypeName, ApiId, FieldName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resolvers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resolvers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resolvers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resolvers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -227,6 +259,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resolver</code>.
 ```sql
 SELECT
@@ -252,6 +293,19 @@ metrics_config
 FROM awscc.appsync.resolvers
 WHERE region = 'us-east-1' AND data__Identifier = '<ResolverArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resolvers</code> in a region.
+```sql
+SELECT
+region,
+resolver_arn
+FROM awscc.appsync.resolvers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -391,6 +445,32 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appsync.resolvers
+SET data__PatchDocument = string('{{ {
+    "CachingConfig": caching_config,
+    "Code": code,
+    "CodeS3Location": code_s3_location,
+    "DataSourceName": data_source_name,
+    "Kind": kind,
+    "MaxBatchSize": max_batch_size,
+    "PipelineConfig": pipeline_config,
+    "RequestMappingTemplate": request_mapping_template,
+    "RequestMappingTemplateS3Location": request_mapping_template_s3_location,
+    "ResponseMappingTemplate": response_mapping_template,
+    "ResponseMappingTemplateS3Location": response_mapping_template_s3_location,
+    "Runtime": runtime,
+    "SyncConfig": sync_config,
+    "MetricsConfig": metrics_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ResolverArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appsync/resolvers_list_only/index.md b/website/docs/services/appsync/resolvers_list_only/index.md
deleted file mode 100644
index 6cb9e5964..000000000
--- a/website/docs/services/appsync/resolvers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resolvers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resolvers_list_only
-  - appsync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resolvers</code> in a region or regions, for all properties use <a href="/services/appsync/resolvers/"><code>resolvers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resolvers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::AppSync::Resolver&#96;&#96; resource defines the logical GraphQL resolver that you attach to fields in a schema. Request and response templates for resolvers are written in Apache Velocity Template Language (VTL) format. For more information about resolvers, see &#91;Resolver Mapping Template Reference&#93;(https://docs.aws.amazon.com/appsync/latest/devguide/resolver-mapping-template-reference.html).<br />When you submit an update, CFNLong updates resources based on differences between what you submit and the stack's current template. To cause this resource to be updated you must change a property value for this resource in the CFNshort template. Changing the S3 file content without changing a property value will not result in an update operation.<br />See &#91;Update Behaviors of Stack Resources&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html) in the &#42;User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appsync.resolvers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "resolver_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resolvers</code> in a region.
-```sql
-SELECT
-region,
-resolver_arn
-FROM awscc.appsync.resolvers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resolvers_list_only</code> resource, see <a href="/services/appsync/resolvers/#permissions"><code>resolvers</code></a>
-
diff --git a/website/docs/services/appsync/source_api_associations/index.md b/website/docs/services/appsync/source_api_associations/index.md
index ea5ea226f..f194e6b1e 100644
--- a/website/docs/services/appsync/source_api_associations/index.md
+++ b/website/docs/services/appsync/source_api_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>source_api_association</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "source_api_identifier",
@@ -112,6 +121,23 @@ Creates, updates, deletes or gets a <code>source_api_association</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "association_arn",
+    "type": "string",
+    "description": "ARN of the SourceApiAssociation."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-sourceapiassociation.html"><code>AWS::AppSync::SourceApiAssociation</code></a>.
 
@@ -121,31 +147,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>source_api_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>source_api_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>source_api_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>source_api_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>source_api_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -154,6 +186,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>source_api_association</code>.
 ```sql
 SELECT
@@ -174,6 +215,19 @@ last_successful_merge_date
 FROM awscc.appsync.source_api_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<AssociationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>source_api_associations</code> in a region.
+```sql
+SELECT
+region,
+association_arn
+FROM awscc.appsync.source_api_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -252,6 +306,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.appsync.source_api_associations
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "SourceApiAssociationConfig": source_api_association_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AssociationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/appsync/source_api_associations_list_only/index.md b/website/docs/services/appsync/source_api_associations_list_only/index.md
deleted file mode 100644
index cc73adf50..000000000
--- a/website/docs/services/appsync/source_api_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: source_api_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - source_api_associations_list_only
-  - appsync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>source_api_associations</code> in a region or regions, for all properties use <a href="/services/appsync/source_api_associations/"><code>source_api_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>source_api_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AppSync::SourceApiAssociation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.appsync.source_api_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "association_arn",
-    "type": "string",
-    "description": "ARN of the SourceApiAssociation."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>source_api_associations</code> in a region.
-```sql
-SELECT
-region,
-association_arn
-FROM awscc.appsync.source_api_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>source_api_associations_list_only</code> resource, see <a href="/services/appsync/source_api_associations/#permissions"><code>source_api_associations</code></a>
-
diff --git a/website/docs/services/apptest/index.md b/website/docs/services/apptest/index.md
index d216cc292..7849fe8d9 100644
--- a/website/docs/services/apptest/index.md
+++ b/website/docs/services/apptest/index.md
@@ -20,7 +20,7 @@ The apptest service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The apptest service documentation.
 <a href="/services/apptest/test_cases/">test_cases</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/apptest/test_cases_list_only/">test_cases_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/apptest/test_cases/index.md b/website/docs/services/apptest/test_cases/index.md
index afba8a602..dbcfdbca6 100644
--- a/website/docs/services/apptest/test_cases/index.md
+++ b/website/docs/services/apptest/test_cases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>test_case</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "creation_time",
@@ -124,6 +133,23 @@ Creates, updates, deletes or gets a <code>test_case</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "test_case_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apptest-testcase.html"><code>AWS::AppTest::TestCase</code></a>.
 
@@ -133,31 +159,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>test_cases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Steps, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>test_cases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>test_cases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>test_cases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>test_cases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -166,6 +198,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>test_case</code>.
 ```sql
 SELECT
@@ -184,6 +225,19 @@ test_case_version
 FROM awscc.apptest.test_cases
 WHERE region = 'us-east-1' AND data__Identifier = '<TestCaseId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>test_cases</code> in a region.
+```sql
+SELECT
+region,
+test_case_id
+FROM awscc.apptest.test_cases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -261,6 +315,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.apptest.test_cases
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Steps": steps,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TestCaseId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/apptest/test_cases_list_only/index.md b/website/docs/services/apptest/test_cases_list_only/index.md
deleted file mode 100644
index 98f37b0cb..000000000
--- a/website/docs/services/apptest/test_cases_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: test_cases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - test_cases_list_only
-  - apptest
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>test_cases</code> in a region or regions, for all properties use <a href="/services/apptest/test_cases/"><code>test_cases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>test_cases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a Test Case that can be captured and executed</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.apptest.test_cases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "test_case_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>test_cases</code> in a region.
-```sql
-SELECT
-region,
-test_case_id
-FROM awscc.apptest.test_cases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>test_cases_list_only</code> resource, see <a href="/services/apptest/test_cases/#permissions"><code>test_cases</code></a>
-
diff --git a/website/docs/services/aps/index.md b/website/docs/services/aps/index.md
index 09f19792f..6d24c12f5 100644
--- a/website/docs/services/aps/index.md
+++ b/website/docs/services/aps/index.md
@@ -20,7 +20,7 @@ The aps service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The aps service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/aps/resource_policies/">resource_policies</a><br />
-<a href="/services/aps/resource_policies_list_only/">resource_policies_list_only</a><br />
-<a href="/services/aps/rule_groups_namespaces/">rule_groups_namespaces</a><br />
-<a href="/services/aps/rule_groups_namespaces_list_only/">rule_groups_namespaces_list_only</a>
+<a href="/services/aps/rule_groups_namespaces/">rule_groups_namespaces</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/aps/scrapers/">scrapers</a><br />
-<a href="/services/aps/scrapers_list_only/">scrapers_list_only</a><br />
-<a href="/services/aps/workspaces/">workspaces</a><br />
-<a href="/services/aps/workspaces_list_only/">workspaces_list_only</a>
+<a href="/services/aps/workspaces/">workspaces</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/aps/resource_policies/index.md b/website/docs/services/aps/resource_policies/index.md
index c72a328c9..5577f1097 100644
--- a/website/docs/services/aps/resource_policies/index.md
+++ b/website/docs/services/aps/resource_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_policy</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "workspace_arn",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>resource_policy</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "workspace_arn",
+    "type": "string",
+    "description": "The Arn of an APS Workspace that the PolicyDocument will be attached to."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aps-resourcepolicy.html"><code>AWS::APS::ResourcePolicy</code></a>.
 
@@ -59,31 +85,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="WorkspaceArn, PolicyDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +124,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_policy</code>.
 ```sql
 SELECT
@@ -101,6 +142,19 @@ policy_document
 FROM awscc.aps.resource_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<WorkspaceArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_policies</code> in a region.
+```sql
+SELECT
+region,
+workspace_arn
+FROM awscc.aps.resource_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -167,6 +221,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.aps.resource_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyDocument": policy_document
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<WorkspaceArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/aps/resource_policies_list_only/index.md b/website/docs/services/aps/resource_policies_list_only/index.md
deleted file mode 100644
index 9b96f60ed..000000000
--- a/website/docs/services/aps/resource_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_policies_list_only
-  - aps
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_policies</code> in a region or regions, for all properties use <a href="/services/aps/resource_policies/"><code>resource_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::APS::ResourcePolicy</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.aps.resource_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "workspace_arn",
-    "type": "string",
-    "description": "The Arn of an APS Workspace that the PolicyDocument will be attached to."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_policies</code> in a region.
-```sql
-SELECT
-region,
-workspace_arn
-FROM awscc.aps.resource_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_policies_list_only</code> resource, see <a href="/services/aps/resource_policies/#permissions"><code>resource_policies</code></a>
-
diff --git a/website/docs/services/aps/rule_groups_namespaces/index.md b/website/docs/services/aps/rule_groups_namespaces/index.md
index 7c98adb92..c9f19d216 100644
--- a/website/docs/services/aps/rule_groups_namespaces/index.md
+++ b/website/docs/services/aps/rule_groups_namespaces/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>rule_groups_namespace</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "workspace",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>rule_groups_namespace</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The RuleGroupsNamespace ARN."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aps-rulegroupsnamespace.html"><code>AWS::APS::RuleGroupsNamespace</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>rule_groups_namespaces</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Workspace, Data, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>rule_groups_namespaces</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>rule_groups_namespaces</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>rule_groups_namespaces_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>rule_groups_namespaces</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>rule_groups_namespace</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.aps.rule_groups_namespaces
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>rule_groups_namespaces</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.aps.rule_groups_namespaces_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -209,6 +263,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.aps.rule_groups_namespaces
+SET data__PatchDocument = string('{{ {
+    "Data": data,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/aps/rule_groups_namespaces_list_only/index.md b/website/docs/services/aps/rule_groups_namespaces_list_only/index.md
deleted file mode 100644
index 4fd1a8dd2..000000000
--- a/website/docs/services/aps/rule_groups_namespaces_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: rule_groups_namespaces_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - rule_groups_namespaces_list_only
-  - aps
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>rule_groups_namespaces</code> in a region or regions, for all properties use <a href="/services/aps/rule_groups_namespaces/"><code>rule_groups_namespaces</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>rule_groups_namespaces_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>RuleGroupsNamespace schema for cloudformation.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.aps.rule_groups_namespaces_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The RuleGroupsNamespace ARN."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>rule_groups_namespaces</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.aps.rule_groups_namespaces_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>rule_groups_namespaces_list_only</code> resource, see <a href="/services/aps/rule_groups_namespaces/#permissions"><code>rule_groups_namespaces</code></a>
-
diff --git a/website/docs/services/aps/scrapers/index.md b/website/docs/services/aps/scrapers/index.md
index 61c6a1625..91baf3e18 100644
--- a/website/docs/services/aps/scrapers/index.md
+++ b/website/docs/services/aps/scrapers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>scraper</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "scraper_id",
@@ -154,6 +163,23 @@ Creates, updates, deletes or gets a <code>scraper</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Scraper ARN."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aps-scraper.html"><code>AWS::APS::Scraper</code></a>.
 
@@ -163,31 +189,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>scrapers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ScrapeConfiguration, Source, Destination, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>scrapers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>scrapers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>scrapers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>scrapers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -196,6 +228,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>scraper</code>.
 ```sql
 SELECT
@@ -212,6 +253,19 @@ tags
 FROM awscc.aps.scrapers
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>scrapers</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.aps.scrapers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -309,6 +363,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.aps.scrapers
+SET data__PatchDocument = string('{{ {
+    "Alias": alias,
+    "ScrapeConfiguration": scrape_configuration,
+    "RoleConfiguration": role_configuration,
+    "Destination": destination,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/aps/scrapers_list_only/index.md b/website/docs/services/aps/scrapers_list_only/index.md
deleted file mode 100644
index 683db9d94..000000000
--- a/website/docs/services/aps/scrapers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: scrapers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - scrapers_list_only
-  - aps
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>scrapers</code> in a region or regions, for all properties use <a href="/services/aps/scrapers/"><code>scrapers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>scrapers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::APS::Scraper</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.aps.scrapers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Scraper ARN."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>scrapers</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.aps.scrapers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>scrapers_list_only</code> resource, see <a href="/services/aps/scrapers/#permissions"><code>scrapers</code></a>
-
diff --git a/website/docs/services/aps/workspaces/index.md b/website/docs/services/aps/workspaces/index.md
index d4e476766..26baac9b1 100644
--- a/website/docs/services/aps/workspaces/index.md
+++ b/website/docs/services/aps/workspaces/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>workspace</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "workspace_id",
@@ -185,6 +194,23 @@ Creates, updates, deletes or gets a <code>workspace</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Workspace arn."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aps-workspace.html"><code>AWS::APS::Workspace</code></a>.
 
@@ -194,31 +220,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>workspaces</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>workspaces</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>workspaces</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>workspaces_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>workspaces</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -227,6 +259,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>workspace</code>.
 ```sql
 SELECT
@@ -244,6 +285,19 @@ tags
 FROM awscc.aps.workspaces
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>workspaces</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.aps.workspaces_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -343,6 +397,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.aps.workspaces
+SET data__PatchDocument = string('{{ {
+    "Alias": alias,
+    "AlertManagerDefinition": alert_manager_definition,
+    "LoggingConfiguration": logging_configuration,
+    "WorkspaceConfiguration": workspace_configuration,
+    "QueryLoggingConfiguration": query_logging_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/aps/workspaces_list_only/index.md b/website/docs/services/aps/workspaces_list_only/index.md
deleted file mode 100644
index 13d1385b6..000000000
--- a/website/docs/services/aps/workspaces_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: workspaces_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - workspaces_list_only
-  - aps
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>workspaces</code> in a region or regions, for all properties use <a href="/services/aps/workspaces/"><code>workspaces</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>workspaces_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::APS::Workspace</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.aps.workspaces_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Workspace arn."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>workspaces</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.aps.workspaces_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>workspaces_list_only</code> resource, see <a href="/services/aps/workspaces/#permissions"><code>workspaces</code></a>
-
diff --git a/website/docs/services/arcregionswitch/index.md b/website/docs/services/arcregionswitch/index.md
index 987a479a0..1f536f860 100644
--- a/website/docs/services/arcregionswitch/index.md
+++ b/website/docs/services/arcregionswitch/index.md
@@ -20,7 +20,7 @@ The arcregionswitch service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The arcregionswitch service documentation.
 <a href="/services/arcregionswitch/plans/">plans</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/arcregionswitch/plans_list_only/">plans_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/arcregionswitch/plans/index.md b/website/docs/services/arcregionswitch/plans/index.md
index 793528647..6949220db 100644
--- a/website/docs/services/arcregionswitch/plans/index.md
+++ b/website/docs/services/arcregionswitch/plans/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>plan</code> resource or lists <code>pl
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -225,6 +234,23 @@ Creates, updates, deletes or gets a <code>plan</code> resource or lists <code>pl
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-arcregionswitch-plan.html"><code>AWS::ARCRegionSwitch::Plan</code></a>.
 
@@ -234,31 +260,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>plans</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ExecutionRole, Name, RecoveryApproach, Regions, Workflows, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>plans</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>plans</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>plans_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>plans</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -267,6 +299,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>plan</code>.
 ```sql
 SELECT
@@ -290,6 +331,19 @@ route53_health_checks
 FROM awscc.arcregionswitch.plans
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>plans</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.arcregionswitch.plans_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -414,6 +468,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.arcregionswitch.plans
+SET data__PatchDocument = string('{{ {
+    "AssociatedAlarms": associated_alarms,
+    "Description": description,
+    "ExecutionRole": execution_role,
+    "RecoveryTimeObjectiveMinutes": recovery_time_objective_minutes,
+    "Tags": tags,
+    "Triggers": triggers,
+    "Workflows": workflows
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/arcregionswitch/plans_list_only/index.md b/website/docs/services/arcregionswitch/plans_list_only/index.md
deleted file mode 100644
index d8e00ec93..000000000
--- a/website/docs/services/arcregionswitch/plans_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: plans_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - plans_list_only
-  - arcregionswitch
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>plans</code> in a region or regions, for all properties use <a href="/services/arcregionswitch/plans/"><code>plans</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>plans_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a plan that specifies Regions, IAM roles, and workflows of logic required to perform the desired change to your multi-Region application</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.arcregionswitch.plans_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>plans</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.arcregionswitch.plans_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>plans_list_only</code> resource, see <a href="/services/arcregionswitch/plans/#permissions"><code>plans</code></a>
-
diff --git a/website/docs/services/arczonalshift/autoshift_observer_notification_statuses/index.md b/website/docs/services/arczonalshift/autoshift_observer_notification_statuses/index.md
index 4fae70232..897315015 100644
--- a/website/docs/services/arczonalshift/autoshift_observer_notification_statuses/index.md
+++ b/website/docs/services/arczonalshift/autoshift_observer_notification_statuses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>autoshift_observer_notification_statu
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "status",
@@ -67,6 +76,28 @@ Creates, updates, deletes or gets an <code>autoshift_observer_notification_statu
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "account_id",
+    "type": "string",
+    "description": "User account id, used as part of the primary identifier for the resource"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "Region, used as part of the primary identifier for the resource"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-arczonalshift-autoshiftobservernotificationstatus.html"><code>AWS::ARCZonalShift::AutoshiftObserverNotificationStatus</code></a>.
 
@@ -76,26 +107,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>autoshift_observer_notification_statuses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Status, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>autoshift_observer_notification_statuses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>autoshift_observer_notification_statuses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>autoshift_observer_notification_statuses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -104,6 +140,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>autoshift_observer_notification_status</code>.
 ```sql
 SELECT
@@ -114,6 +159,20 @@ region
 FROM awscc.arczonalshift.autoshift_observer_notification_statuses
 WHERE region = 'us-east-1' AND data__Identifier = '<AccountId>|<Region>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>autoshift_observer_notification_statuses</code> in a region.
+```sql
+SELECT
+region,
+account_id,
+region
+FROM awscc.arczonalshift.autoshift_observer_notification_statuses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -175,6 +234,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/arczonalshift/autoshift_observer_notification_statuses_list_only/index.md b/website/docs/services/arczonalshift/autoshift_observer_notification_statuses_list_only/index.md
deleted file mode 100644
index a2ea21eba..000000000
--- a/website/docs/services/arczonalshift/autoshift_observer_notification_statuses_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: autoshift_observer_notification_statuses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - autoshift_observer_notification_statuses_list_only
-  - arczonalshift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>autoshift_observer_notification_statuses</code> in a region or regions, for all properties use <a href="/services/arczonalshift/autoshift_observer_notification_statuses/"><code>autoshift_observer_notification_statuses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>autoshift_observer_notification_statuses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::ARCZonalShift::AutoshiftObserverNotificationStatus Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.arczonalshift.autoshift_observer_notification_statuses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "account_id",
-    "type": "string",
-    "description": "User account id, used as part of the primary identifier for the resource"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "Region, used as part of the primary identifier for the resource"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>autoshift_observer_notification_statuses</code> in a region.
-```sql
-SELECT
-region,
-account_id,
-region
-FROM awscc.arczonalshift.autoshift_observer_notification_statuses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>autoshift_observer_notification_statuses_list_only</code> resource, see <a href="/services/arczonalshift/autoshift_observer_notification_statuses/#permissions"><code>autoshift_observer_notification_statuses</code></a>
-
diff --git a/website/docs/services/arczonalshift/index.md b/website/docs/services/arczonalshift/index.md
index 05923fe15..4dee61b46 100644
--- a/website/docs/services/arczonalshift/index.md
+++ b/website/docs/services/arczonalshift/index.md
@@ -20,7 +20,7 @@ The arczonalshift service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The arczonalshift service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/arczonalshift/autoshift_observer_notification_statuses/">autoshift_observer_notification_statuses</a><br />
-<a href="/services/arczonalshift/autoshift_observer_notification_statuses_list_only/">autoshift_observer_notification_statuses_list_only</a>
+<a href="/services/arczonalshift/autoshift_observer_notification_statuses/">autoshift_observer_notification_statuses</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/arczonalshift/zonal_autoshift_configurations/">zonal_autoshift_configurations</a><br />
-<a href="/services/arczonalshift/zonal_autoshift_configurations_list_only/">zonal_autoshift_configurations_list_only</a>
+<a href="/services/arczonalshift/zonal_autoshift_configurations/">zonal_autoshift_configurations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/arczonalshift/zonal_autoshift_configurations/index.md b/website/docs/services/arczonalshift/zonal_autoshift_configurations/index.md
index 975f37979..f80944ef2 100644
--- a/website/docs/services/arczonalshift/zonal_autoshift_configurations/index.md
+++ b/website/docs/services/arczonalshift/zonal_autoshift_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>zonal_autoshift_configuration</code> r
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "zonal_autoshift_status",
@@ -89,6 +98,23 @@ Creates, updates, deletes or gets a <code>zonal_autoshift_configuration</code> r
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "resource_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-arczonalshift-zonalautoshiftconfiguration.html"><code>AWS::ARCZonalShift::ZonalAutoshiftConfiguration</code></a>.
 
@@ -98,31 +124,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>zonal_autoshift_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>zonal_autoshift_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>zonal_autoshift_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>zonal_autoshift_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>zonal_autoshift_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -131,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>zonal_autoshift_configuration</code>.
 ```sql
 SELECT
@@ -141,6 +182,19 @@ resource_identifier
 FROM awscc.arczonalshift.zonal_autoshift_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<ResourceIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>zonal_autoshift_configurations</code> in a region.
+```sql
+SELECT
+region,
+resource_identifier
+FROM awscc.arczonalshift.zonal_autoshift_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -222,6 +276,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.arczonalshift.zonal_autoshift_configurations
+SET data__PatchDocument = string('{{ {
+    "ZonalAutoshiftStatus": zonal_autoshift_status,
+    "PracticeRunConfiguration": practice_run_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ResourceIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/arczonalshift/zonal_autoshift_configurations_list_only/index.md b/website/docs/services/arczonalshift/zonal_autoshift_configurations_list_only/index.md
deleted file mode 100644
index f608fdf34..000000000
--- a/website/docs/services/arczonalshift/zonal_autoshift_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: zonal_autoshift_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - zonal_autoshift_configurations_list_only
-  - arczonalshift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>zonal_autoshift_configurations</code> in a region or regions, for all properties use <a href="/services/arczonalshift/zonal_autoshift_configurations/"><code>zonal_autoshift_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>zonal_autoshift_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::ARCZonalShift::ZonalAutoshiftConfiguration Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.arczonalshift.zonal_autoshift_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "resource_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>zonal_autoshift_configurations</code> in a region.
-```sql
-SELECT
-region,
-resource_identifier
-FROM awscc.arczonalshift.zonal_autoshift_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>zonal_autoshift_configurations_list_only</code> resource, see <a href="/services/arczonalshift/zonal_autoshift_configurations/#permissions"><code>zonal_autoshift_configurations</code></a>
-
diff --git a/website/docs/services/athena/capacity_reservations/index.md b/website/docs/services/athena/capacity_reservations/index.md
index d7f6a2537..78301b5be 100644
--- a/website/docs/services/athena/capacity_reservations/index.md
+++ b/website/docs/services/athena/capacity_reservations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>capacity_reservation</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -111,6 +120,23 @@ Creates, updates, deletes or gets a <code>capacity_reservation</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the specified capacity reservation"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-capacityreservation.html"><code>AWS::Athena::CapacityReservation</code></a>.
 
@@ -120,31 +146,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>capacity_reservations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, TargetDpus, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>capacity_reservations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>capacity_reservations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>capacity_reservations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>capacity_reservations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -153,6 +185,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>capacity_reservation</code>.
 ```sql
 SELECT
@@ -169,6 +210,19 @@ tags
 FROM awscc.athena.capacity_reservations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>capacity_reservations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.athena.capacity_reservations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -248,6 +302,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.athena.capacity_reservations
+SET data__PatchDocument = string('{{ {
+    "TargetDpus": target_dpus,
+    "CapacityAssignmentConfiguration": capacity_assignment_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/athena/capacity_reservations_list_only/index.md b/website/docs/services/athena/capacity_reservations_list_only/index.md
deleted file mode 100644
index 94a986812..000000000
--- a/website/docs/services/athena/capacity_reservations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: capacity_reservations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - capacity_reservations_list_only
-  - athena
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>capacity_reservations</code> in a region or regions, for all properties use <a href="/services/athena/capacity_reservations/"><code>capacity_reservations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>capacity_reservations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Athena::CapacityReservation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.athena.capacity_reservations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the specified capacity reservation"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>capacity_reservations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.athena.capacity_reservations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>capacity_reservations_list_only</code> resource, see <a href="/services/athena/capacity_reservations/#permissions"><code>capacity_reservations</code></a>
-
diff --git a/website/docs/services/athena/data_catalogs/index.md b/website/docs/services/athena/data_catalogs/index.md
index 4a55867ab..6d8c48b65 100644
--- a/website/docs/services/athena/data_catalogs/index.md
+++ b/website/docs/services/athena/data_catalogs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_catalog</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>data_catalog</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the data catalog to create. The catalog name must be unique for the AWS account and can use a maximum of 128 alphanumeric, underscore, at sign, or hyphen characters."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-datacatalog.html"><code>AWS::Athena::DataCatalog</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_catalogs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_catalogs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_catalogs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_catalogs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_catalogs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_catalog</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ error
 FROM awscc.athena.data_catalogs
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_catalogs</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.athena.data_catalogs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -241,6 +295,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.athena.data_catalogs
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Parameters": parameters,
+    "Tags": tags,
+    "Type": type,
+    "Status": status,
+    "ConnectionType": connection_type,
+    "Error": error
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/athena/data_catalogs_list_only/index.md b/website/docs/services/athena/data_catalogs_list_only/index.md
deleted file mode 100644
index d786782c7..000000000
--- a/website/docs/services/athena/data_catalogs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: data_catalogs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_catalogs_list_only
-  - athena
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_catalogs</code> in a region or regions, for all properties use <a href="/services/athena/data_catalogs/"><code>data_catalogs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_catalogs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Athena::DataCatalog</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.athena.data_catalogs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the data catalog to create. The catalog name must be unique for the AWS account and can use a maximum of 128 alphanumeric, underscore, at sign, or hyphen characters."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_catalogs</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.athena.data_catalogs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_catalogs_list_only</code> resource, see <a href="/services/athena/data_catalogs/#permissions"><code>data_catalogs</code></a>
-
diff --git a/website/docs/services/athena/index.md b/website/docs/services/athena/index.md
index 129adcf53..909a461aa 100644
--- a/website/docs/services/athena/index.md
+++ b/website/docs/services/athena/index.md
@@ -20,7 +20,7 @@ The athena service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>10</b></span><br />
+<span>total resources:&nbsp;<b>5</b></span><br />
 </div>
 </div>
 
@@ -30,16 +30,11 @@ The athena service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/athena/capacity_reservations/">capacity_reservations</a><br />
-<a href="/services/athena/capacity_reservations_list_only/">capacity_reservations_list_only</a><br />
 <a href="/services/athena/data_catalogs/">data_catalogs</a><br />
-<a href="/services/athena/data_catalogs_list_only/">data_catalogs_list_only</a><br />
 <a href="/services/athena/named_queries/">named_queries</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/athena/named_queries_list_only/">named_queries_list_only</a><br />
 <a href="/services/athena/prepared_statements/">prepared_statements</a><br />
-<a href="/services/athena/prepared_statements_list_only/">prepared_statements_list_only</a><br />
-<a href="/services/athena/work_groups/">work_groups</a><br />
-<a href="/services/athena/work_groups_list_only/">work_groups_list_only</a>
+<a href="/services/athena/work_groups/">work_groups</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/athena/named_queries/index.md b/website/docs/services/athena/named_queries/index.md
index 1ab5616df..67cc6a0ea 100644
--- a/website/docs/services/athena/named_queries/index.md
+++ b/website/docs/services/athena/named_queries/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>named_query</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -70,6 +79,28 @@ Creates, updates, deletes or gets a <code>named_query</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The query name."
+  },
+  {
+    "name": "named_query_id",
+    "type": "string",
+    "description": "The unique ID of the query."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html"><code>AWS::Athena::NamedQuery</code></a>.
 
@@ -79,26 +110,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>named_queries</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Database, QueryString, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>named_queries</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>named_queries_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>named_queries</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +143,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>named_query</code>.
 ```sql
 SELECT
@@ -120,6 +165,19 @@ named_query_id
 FROM awscc.athena.named_queries
 WHERE region = 'us-east-1' AND data__Identifier = '<NamedQueryId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>named_queries</code> in a region.
+```sql
+SELECT
+region,
+named_query_id
+FROM awscc.athena.named_queries_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -198,6 +256,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/athena/named_queries_list_only/index.md b/website/docs/services/athena/named_queries_list_only/index.md
deleted file mode 100644
index a822770aa..000000000
--- a/website/docs/services/athena/named_queries_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: named_queries_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - named_queries_list_only
-  - athena
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>named_queries</code> in a region or regions, for all properties use <a href="/services/athena/named_queries/"><code>named_queries</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>named_queries_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Athena::NamedQuery</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.athena.named_queries_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The query name."
-  },
-  {
-    "name": "named_query_id",
-    "type": "string",
-    "description": "The unique ID of the query."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>named_queries</code> in a region.
-```sql
-SELECT
-region,
-named_query_id
-FROM awscc.athena.named_queries_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>named_queries_list_only</code> resource, see <a href="/services/athena/named_queries/#permissions"><code>named_queries</code></a>
-
diff --git a/website/docs/services/athena/prepared_statements/index.md b/website/docs/services/athena/prepared_statements/index.md
index 914556f20..57e3bccc1 100644
--- a/website/docs/services/athena/prepared_statements/index.md
+++ b/website/docs/services/athena/prepared_statements/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>prepared_statement</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "statement_name",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets a <code>prepared_statement</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "statement_name",
+    "type": "string",
+    "description": "The name of the prepared statement."
+  },
+  {
+    "name": "work_group",
+    "type": "string",
+    "description": "The name of the workgroup to which the prepared statement belongs."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-preparedstatement.html"><code>AWS::Athena::PreparedStatement</code></a>.
 
@@ -69,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>prepared_statements</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="StatementName, WorkGroup, QueryStatement, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>prepared_statements</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>prepared_statements</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>prepared_statements_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>prepared_statements</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>prepared_statement</code>.
 ```sql
 SELECT
@@ -113,6 +159,20 @@ query_statement
 FROM awscc.athena.prepared_statements
 WHERE region = 'us-east-1' AND data__Identifier = '<StatementName>|<WorkGroup>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>prepared_statements</code> in a region.
+```sql
+SELECT
+region,
+statement_name,
+work_group
+FROM awscc.athena.prepared_statements_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -189,6 +249,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.athena.prepared_statements
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "QueryStatement": query_statement
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<StatementName>|<WorkGroup>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/athena/prepared_statements_list_only/index.md b/website/docs/services/athena/prepared_statements_list_only/index.md
deleted file mode 100644
index b69902b21..000000000
--- a/website/docs/services/athena/prepared_statements_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: prepared_statements_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - prepared_statements_list_only
-  - athena
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>prepared_statements</code> in a region or regions, for all properties use <a href="/services/athena/prepared_statements/"><code>prepared_statements</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>prepared_statements_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Athena::PreparedStatement</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.athena.prepared_statements_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "statement_name",
-    "type": "string",
-    "description": "The name of the prepared statement."
-  },
-  {
-    "name": "work_group",
-    "type": "string",
-    "description": "The name of the workgroup to which the prepared statement belongs."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>prepared_statements</code> in a region.
-```sql
-SELECT
-region,
-statement_name,
-work_group
-FROM awscc.athena.prepared_statements_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>prepared_statements_list_only</code> resource, see <a href="/services/athena/prepared_statements/#permissions"><code>prepared_statements</code></a>
-
diff --git a/website/docs/services/athena/work_groups/index.md b/website/docs/services/athena/work_groups/index.md
index c09b0556b..066ebe4c0 100644
--- a/website/docs/services/athena/work_groups/index.md
+++ b/website/docs/services/athena/work_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>work_group</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -384,6 +393,23 @@ Creates, updates, deletes or gets a <code>work_group</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The workGroup name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-workgroup.html"><code>AWS::Athena::WorkGroup</code></a>.
 
@@ -393,31 +419,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>work_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>work_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>work_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>work_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>work_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -426,6 +458,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>work_group</code>.
 ```sql
 SELECT
@@ -441,6 +482,19 @@ recursive_delete_option
 FROM awscc.athena.work_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>work_groups</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.athena.work_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -570,6 +624,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.athena.work_groups
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags,
+    "State": state,
+    "RecursiveDeleteOption": recursive_delete_option
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/athena/work_groups_list_only/index.md b/website/docs/services/athena/work_groups_list_only/index.md
deleted file mode 100644
index 35f5273ba..000000000
--- a/website/docs/services/athena/work_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: work_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - work_groups_list_only
-  - athena
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>work_groups</code> in a region or regions, for all properties use <a href="/services/athena/work_groups/"><code>work_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>work_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Athena::WorkGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.athena.work_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The workGroup name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>work_groups</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.athena.work_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>work_groups_list_only</code> resource, see <a href="/services/athena/work_groups/#permissions"><code>work_groups</code></a>
-
diff --git a/website/docs/services/auditmanager/assessments/index.md b/website/docs/services/auditmanager/assessments/index.md
index 65a39238f..9d1133870 100644
--- a/website/docs/services/auditmanager/assessments/index.md
+++ b/website/docs/services/auditmanager/assessments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>assessment</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "framework_id",
@@ -219,6 +228,23 @@ Creates, updates, deletes or gets an <code>assessment</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "assessment_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-auditmanager-assessment.html"><code>AWS::AuditManager::Assessment</code></a>.
 
@@ -228,31 +254,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>assessments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>assessments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>assessments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>assessments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>assessments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -261,6 +293,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>assessment</code>.
 ```sql
 SELECT
@@ -281,6 +322,19 @@ description
 FROM awscc.auditmanager.assessments
 WHERE region = 'us-east-1' AND data__Identifier = '<AssessmentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>assessments</code> in a region.
+```sql
+SELECT
+region,
+assessment_id
+FROM awscc.auditmanager.assessments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -401,6 +455,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.auditmanager.assessments
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Delegations": delegations,
+    "Roles": roles,
+    "Scope": scope,
+    "AssessmentReportsDestination": assessment_reports_destination,
+    "Status": status,
+    "Name": name,
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AssessmentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/auditmanager/assessments_list_only/index.md b/website/docs/services/auditmanager/assessments_list_only/index.md
deleted file mode 100644
index 364367a41..000000000
--- a/website/docs/services/auditmanager/assessments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: assessments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - assessments_list_only
-  - auditmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>assessments</code> in a region or regions, for all properties use <a href="/services/auditmanager/assessments/"><code>assessments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>assessments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An entity that defines the scope of audit evidence collected by AWS Audit Manager.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.auditmanager.assessments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "assessment_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>assessments</code> in a region.
-```sql
-SELECT
-region,
-assessment_id
-FROM awscc.auditmanager.assessments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>assessments_list_only</code> resource, see <a href="/services/auditmanager/assessments/#permissions"><code>assessments</code></a>
-
diff --git a/website/docs/services/auditmanager/index.md b/website/docs/services/auditmanager/index.md
index 46e7d9854..bff05476c 100644
--- a/website/docs/services/auditmanager/index.md
+++ b/website/docs/services/auditmanager/index.md
@@ -20,7 +20,7 @@ The auditmanager service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The auditmanager service documentation.
 <a href="/services/auditmanager/assessments/">assessments</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/auditmanager/assessments_list_only/">assessments_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/autoscaling/auto_scaling_groups/index.md b/website/docs/services/autoscaling/auto_scaling_groups/index.md
index 75bee1cae..03177ef75 100644
--- a/website/docs/services/autoscaling/auto_scaling_groups/index.md
+++ b/website/docs/services/autoscaling/auto_scaling_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>auto_scaling_group</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "lifecycle_hook_specification_list",
@@ -445,6 +454,23 @@ Creates, updates, deletes or gets an <code>auto_scaling_group</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "auto_scaling_group_name",
+    "type": "string",
+    "description": "The name of the Auto Scaling group. This name must be unique per Region per account.<br />The name can contain any ASCII character 33 to 126 including most punctuation characters, digits, and upper and lowercased letters.<br />You cannot use a colon (:) in the name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-autoscalinggroup.html"><code>AWS::AutoScaling::AutoScalingGroup</code></a>.
 
@@ -454,31 +480,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>auto_scaling_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="MinSize, MaxSize, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>auto_scaling_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>auto_scaling_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>auto_scaling_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>auto_scaling_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -487,6 +519,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>auto_scaling_group</code>.
 ```sql
 SELECT
@@ -530,6 +571,19 @@ max_instance_lifetime
 FROM awscc.autoscaling.auto_scaling_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<AutoScalingGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>auto_scaling_groups</code> in a region.
+```sql
+SELECT
+region,
+auto_scaling_group_name
+FROM awscc.autoscaling.auto_scaling_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -834,6 +888,51 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.autoscaling.auto_scaling_groups
+SET data__PatchDocument = string('{{ {
+    "LifecycleHookSpecificationList": lifecycle_hook_specification_list,
+    "LoadBalancerNames": load_balancer_names,
+    "LaunchConfigurationName": launch_configuration_name,
+    "ServiceLinkedRoleARN": service_linked_role_arn,
+    "AvailabilityZoneImpairmentPolicy": availability_zone_impairment_policy,
+    "TargetGroupARNs": target_group_arns,
+    "Cooldown": cooldown,
+    "NotificationConfigurations": notification_configurations,
+    "DesiredCapacity": desired_capacity,
+    "HealthCheckGracePeriod": health_check_grace_period,
+    "DefaultInstanceWarmup": default_instance_warmup,
+    "SkipZonalShiftValidation": skip_zonal_shift_validation,
+    "NewInstancesProtectedFromScaleIn": new_instances_protected_from_scale_in,
+    "LaunchTemplate": launch_template,
+    "MixedInstancesPolicy": mixed_instances_policy,
+    "VPCZoneIdentifier": vpc_zone_identifier,
+    "Tags": tags,
+    "Context": context,
+    "CapacityRebalance": capacity_rebalance,
+    "AvailabilityZones": availability_zones,
+    "NotificationConfiguration": notification_configuration,
+    "AvailabilityZoneDistribution": availability_zone_distribution,
+    "MetricsCollection": metrics_collection,
+    "InstanceMaintenancePolicy": instance_maintenance_policy,
+    "MaxSize": max_size,
+    "MinSize": min_size,
+    "TerminationPolicies": termination_policies,
+    "TrafficSources": traffic_sources,
+    "DesiredCapacityType": desired_capacity_type,
+    "PlacementGroup": placement_group,
+    "CapacityReservationSpecification": capacity_reservation_specification,
+    "HealthCheckType": health_check_type,
+    "MaxInstanceLifetime": max_instance_lifetime
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AutoScalingGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/autoscaling/auto_scaling_groups_list_only/index.md b/website/docs/services/autoscaling/auto_scaling_groups_list_only/index.md
deleted file mode 100644
index 2a6239d8a..000000000
--- a/website/docs/services/autoscaling/auto_scaling_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: auto_scaling_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - auto_scaling_groups_list_only
-  - autoscaling
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>auto_scaling_groups</code> in a region or regions, for all properties use <a href="/services/autoscaling/auto_scaling_groups/"><code>auto_scaling_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>auto_scaling_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::AutoScaling::AutoScalingGroup&#96;&#96; resource defines an Amazon EC2 Auto Scaling group, which is a collection of Amazon EC2 instances that are treated as a logical grouping for the purposes of automatic scaling and management. <br />For more information about Amazon EC2 Auto Scaling, see the &#91;Amazon EC2 Auto Scaling User Guide&#93;(https://docs.aws.amazon.com/autoscaling/ec2/userguide/what-is-amazon-ec2-auto-scaling.html). <br />Amazon EC2 Auto Scaling configures instances launched as part of an Auto Scaling group using either a &#91;launch template&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html) or a launch configuration. We strongly recommend that you do not use launch configurations. For more information, see &#91;Launch configurations&#93;(https://docs.aws.amazon.com/autoscaling/ec2/userguide/launch-configurations.html) in the &#42;Amazon EC2 Auto Scaling User Guide&#42;.<br />For help migrating from launch configurations to launch templates, see &#91;Migrate CloudFormation stacks from launch configurations to launch templates&#93;(https://docs.aws.amazon.com/autoscaling/ec2/userguide/migrate-launch-configurations-with-cloudformation.html) in the &#42;Amazon EC2 Auto Scaling User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.autoscaling.auto_scaling_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "auto_scaling_group_name",
-    "type": "string",
-    "description": "The name of the Auto Scaling group. This name must be unique per Region per account.<br />The name can contain any ASCII character 33 to 126 including most punctuation characters, digits, and upper and lowercased letters.<br />You cannot use a colon (:) in the name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>auto_scaling_groups</code> in a region.
-```sql
-SELECT
-region,
-auto_scaling_group_name
-FROM awscc.autoscaling.auto_scaling_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>auto_scaling_groups_list_only</code> resource, see <a href="/services/autoscaling/auto_scaling_groups/#permissions"><code>auto_scaling_groups</code></a>
-
diff --git a/website/docs/services/autoscaling/index.md b/website/docs/services/autoscaling/index.md
index d9eae8826..fc162ac83 100644
--- a/website/docs/services/autoscaling/index.md
+++ b/website/docs/services/autoscaling/index.md
@@ -20,7 +20,7 @@ The autoscaling service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>12</b></span><br />
+<span>total resources:&nbsp;<b>6</b></span><br />
 </div>
 </div>
 
@@ -30,18 +30,12 @@ The autoscaling service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/autoscaling/auto_scaling_groups/">auto_scaling_groups</a><br />
-<a href="/services/autoscaling/auto_scaling_groups_list_only/">auto_scaling_groups_list_only</a><br />
 <a href="/services/autoscaling/launch_configurations/">launch_configurations</a><br />
-<a href="/services/autoscaling/launch_configurations_list_only/">launch_configurations_list_only</a><br />
-<a href="/services/autoscaling/lifecycle_hooks/">lifecycle_hooks</a><br />
-<a href="/services/autoscaling/lifecycle_hooks_list_only/">lifecycle_hooks_list_only</a>
+<a href="/services/autoscaling/lifecycle_hooks/">lifecycle_hooks</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/autoscaling/scaling_policies/">scaling_policies</a><br />
-<a href="/services/autoscaling/scaling_policies_list_only/">scaling_policies_list_only</a><br />
 <a href="/services/autoscaling/scheduled_actions/">scheduled_actions</a><br />
-<a href="/services/autoscaling/scheduled_actions_list_only/">scheduled_actions_list_only</a><br />
-<a href="/services/autoscaling/warm_pools/">warm_pools</a><br />
-<a href="/services/autoscaling/warm_pools_list_only/">warm_pools_list_only</a>
+<a href="/services/autoscaling/warm_pools/">warm_pools</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/autoscaling/launch_configurations/index.md b/website/docs/services/autoscaling/launch_configurations/index.md
index 5cbf84c5f..7c3f5eb11 100644
--- a/website/docs/services/autoscaling/launch_configurations/index.md
+++ b/website/docs/services/autoscaling/launch_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>launch_configuration</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "placement_tenancy",
@@ -211,6 +220,23 @@ Creates, updates, deletes or gets a <code>launch_configuration</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "launch_configuration_name",
+    "type": "string",
+    "description": "The name of the launch configuration. This name must be unique per Region per account."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-launchconfiguration.html"><code>AWS::AutoScaling::LaunchConfiguration</code></a>.
 
@@ -220,26 +246,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>launch_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ImageId, InstanceType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>launch_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>launch_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>launch_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -248,6 +279,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>launch_configuration</code>.
 ```sql
 SELECT
@@ -274,6 +314,19 @@ instance_monitoring
 FROM awscc.autoscaling.launch_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<LaunchConfigurationName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>launch_configurations</code> in a region.
+```sql
+SELECT
+region,
+launch_configuration_name
+FROM awscc.autoscaling.launch_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -424,6 +477,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/autoscaling/launch_configurations_list_only/index.md b/website/docs/services/autoscaling/launch_configurations_list_only/index.md
deleted file mode 100644
index cf5803b03..000000000
--- a/website/docs/services/autoscaling/launch_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: launch_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - launch_configurations_list_only
-  - autoscaling
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>launch_configurations</code> in a region or regions, for all properties use <a href="/services/autoscaling/launch_configurations/"><code>launch_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>launch_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::AutoScaling::LaunchConfiguration resource specifies the launch configuration that can be used by an Auto Scaling group to configure Amazon EC2 instances.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.autoscaling.launch_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "launch_configuration_name",
-    "type": "string",
-    "description": "The name of the launch configuration. This name must be unique per Region per account."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>launch_configurations</code> in a region.
-```sql
-SELECT
-region,
-launch_configuration_name
-FROM awscc.autoscaling.launch_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>launch_configurations_list_only</code> resource, see <a href="/services/autoscaling/launch_configurations/#permissions"><code>launch_configurations</code></a>
-
diff --git a/website/docs/services/autoscaling/lifecycle_hooks/index.md b/website/docs/services/autoscaling/lifecycle_hooks/index.md
index cf7f49310..bdcd1330a 100644
--- a/website/docs/services/autoscaling/lifecycle_hooks/index.md
+++ b/website/docs/services/autoscaling/lifecycle_hooks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>lifecycle_hook</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "auto_scaling_group_name",
@@ -80,6 +89,28 @@ Creates, updates, deletes or gets a <code>lifecycle_hook</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "auto_scaling_group_name",
+    "type": "string",
+    "description": "The name of the Auto Scaling group for the lifecycle hook."
+  },
+  {
+    "name": "lifecycle_hook_name",
+    "type": "string",
+    "description": "The name of the lifecycle hook."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-lifecyclehook.html"><code>AWS::AutoScaling::LifecycleHook</code></a>.
 
@@ -89,31 +120,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>lifecycle_hooks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LifecycleTransition, AutoScalingGroupName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>lifecycle_hooks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>lifecycle_hooks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>lifecycle_hooks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>lifecycle_hooks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -122,6 +159,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>lifecycle_hook</code>.
 ```sql
 SELECT
@@ -137,6 +183,20 @@ role_arn
 FROM awscc.autoscaling.lifecycle_hooks
 WHERE region = 'us-east-1' AND data__Identifier = '<AutoScalingGroupName>|<LifecycleHookName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>lifecycle_hooks</code> in a region.
+```sql
+SELECT
+region,
+auto_scaling_group_name,
+lifecycle_hook_name
+FROM awscc.autoscaling.lifecycle_hooks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -227,6 +287,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.autoscaling.lifecycle_hooks
+SET data__PatchDocument = string('{{ {
+    "DefaultResult": default_result,
+    "HeartbeatTimeout": heartbeat_timeout,
+    "LifecycleTransition": lifecycle_transition,
+    "NotificationMetadata": notification_metadata,
+    "NotificationTargetARN": notification_target_arn,
+    "RoleARN": role_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AutoScalingGroupName>|<LifecycleHookName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/autoscaling/lifecycle_hooks_list_only/index.md b/website/docs/services/autoscaling/lifecycle_hooks_list_only/index.md
deleted file mode 100644
index ab5e0c05d..000000000
--- a/website/docs/services/autoscaling/lifecycle_hooks_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: lifecycle_hooks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - lifecycle_hooks_list_only
-  - autoscaling
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>lifecycle_hooks</code> in a region or regions, for all properties use <a href="/services/autoscaling/lifecycle_hooks/"><code>lifecycle_hooks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>lifecycle_hooks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::AutoScaling::LifecycleHook</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.autoscaling.lifecycle_hooks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "auto_scaling_group_name",
-    "type": "string",
-    "description": "The name of the Auto Scaling group for the lifecycle hook."
-  },
-  {
-    "name": "lifecycle_hook_name",
-    "type": "string",
-    "description": "The name of the lifecycle hook."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>lifecycle_hooks</code> in a region.
-```sql
-SELECT
-region,
-auto_scaling_group_name,
-lifecycle_hook_name
-FROM awscc.autoscaling.lifecycle_hooks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>lifecycle_hooks_list_only</code> resource, see <a href="/services/autoscaling/lifecycle_hooks/#permissions"><code>lifecycle_hooks</code></a>
-
diff --git a/website/docs/services/autoscaling/scaling_policies/index.md b/website/docs/services/autoscaling/scaling_policies/index.md
index df10e23ec..c1673927b 100644
--- a/website/docs/services/autoscaling/scaling_policies/index.md
+++ b/website/docs/services/autoscaling/scaling_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>scaling_policy</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "metric_aggregation_type",
@@ -358,6 +367,23 @@ Creates, updates, deletes or gets a <code>scaling_policy</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The ARN of the AutoScaling scaling policy"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-scalingpolicy.html"><code>AWS::AutoScaling::ScalingPolicy</code></a>.
 
@@ -367,31 +393,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>scaling_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AutoScalingGroupName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>scaling_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>scaling_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>scaling_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>scaling_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -400,6 +432,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>scaling_policy</code>.
 ```sql
 SELECT
@@ -420,6 +461,19 @@ arn
 FROM awscc.autoscaling.scaling_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>scaling_policies</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.autoscaling.scaling_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -583,6 +637,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.autoscaling.scaling_policies
+SET data__PatchDocument = string('{{ {
+    "MetricAggregationType": metric_aggregation_type,
+    "PolicyType": policy_type,
+    "PredictiveScalingConfiguration": predictive_scaling_configuration,
+    "ScalingAdjustment": scaling_adjustment,
+    "Cooldown": cooldown,
+    "StepAdjustments": step_adjustments,
+    "MinAdjustmentMagnitude": min_adjustment_magnitude,
+    "TargetTrackingConfiguration": target_tracking_configuration,
+    "EstimatedInstanceWarmup": estimated_instance_warmup,
+    "AdjustmentType": adjustment_type
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/autoscaling/scaling_policies_list_only/index.md b/website/docs/services/autoscaling/scaling_policies_list_only/index.md
deleted file mode 100644
index 5efe1757f..000000000
--- a/website/docs/services/autoscaling/scaling_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: scaling_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - scaling_policies_list_only
-  - autoscaling
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>scaling_policies</code> in a region or regions, for all properties use <a href="/services/autoscaling/scaling_policies/"><code>scaling_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>scaling_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::AutoScaling::ScalingPolicy resource specifies an Amazon EC2 Auto Scaling scaling policy so that the Auto Scaling group can scale the number of instances available for your application.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.autoscaling.scaling_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The ARN of the AutoScaling scaling policy"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>scaling_policies</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.autoscaling.scaling_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>scaling_policies_list_only</code> resource, see <a href="/services/autoscaling/scaling_policies/#permissions"><code>scaling_policies</code></a>
-
diff --git a/website/docs/services/autoscaling/scheduled_actions/index.md b/website/docs/services/autoscaling/scheduled_actions/index.md
index b33952b8b..a1809a812 100644
--- a/website/docs/services/autoscaling/scheduled_actions/index.md
+++ b/website/docs/services/autoscaling/scheduled_actions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>scheduled_action</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "scheduled_action_name",
@@ -85,6 +94,28 @@ Creates, updates, deletes or gets a <code>scheduled_action</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "scheduled_action_name",
+    "type": "string",
+    "description": "Auto-generated unique identifier"
+  },
+  {
+    "name": "auto_scaling_group_name",
+    "type": "string",
+    "description": "The name of the Auto Scaling group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-scheduledaction.html"><code>AWS::AutoScaling::ScheduledAction</code></a>.
 
@@ -94,31 +125,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>scheduled_actions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AutoScalingGroupName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>scheduled_actions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>scheduled_actions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>scheduled_actions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>scheduled_actions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -127,6 +164,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>scheduled_action</code>.
 ```sql
 SELECT
@@ -143,6 +189,20 @@ max_size
 FROM awscc.autoscaling.scheduled_actions
 WHERE region = 'us-east-1' AND data__Identifier = '<ScheduledActionName>|<AutoScalingGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>scheduled_actions</code> in a region.
+```sql
+SELECT
+region,
+scheduled_action_name,
+auto_scaling_group_name
+FROM awscc.autoscaling.scheduled_actions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -231,6 +291,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.autoscaling.scheduled_actions
+SET data__PatchDocument = string('{{ {
+    "MinSize": min_size,
+    "Recurrence": recurrence,
+    "TimeZone": time_zone,
+    "EndTime": end_time,
+    "StartTime": start_time,
+    "DesiredCapacity": desired_capacity,
+    "MaxSize": max_size
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ScheduledActionName>|<AutoScalingGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/autoscaling/scheduled_actions_list_only/index.md b/website/docs/services/autoscaling/scheduled_actions_list_only/index.md
deleted file mode 100644
index 7b1a31f63..000000000
--- a/website/docs/services/autoscaling/scheduled_actions_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: scheduled_actions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - scheduled_actions_list_only
-  - autoscaling
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>scheduled_actions</code> in a region or regions, for all properties use <a href="/services/autoscaling/scheduled_actions/"><code>scheduled_actions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>scheduled_actions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::AutoScaling::ScheduledAction resource specifies an Amazon EC2 Auto Scaling scheduled action so that the Auto Scaling group can change the number of instances available for your application in response to predictable load changes.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.autoscaling.scheduled_actions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "scheduled_action_name",
-    "type": "string",
-    "description": "Auto-generated unique identifier"
-  },
-  {
-    "name": "auto_scaling_group_name",
-    "type": "string",
-    "description": "The name of the Auto Scaling group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>scheduled_actions</code> in a region.
-```sql
-SELECT
-region,
-scheduled_action_name,
-auto_scaling_group_name
-FROM awscc.autoscaling.scheduled_actions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>scheduled_actions_list_only</code> resource, see <a href="/services/autoscaling/scheduled_actions/#permissions"><code>scheduled_actions</code></a>
-
diff --git a/website/docs/services/autoscaling/warm_pools/index.md b/website/docs/services/autoscaling/warm_pools/index.md
index ec2b5ab5c..b0a24a774 100644
--- a/website/docs/services/autoscaling/warm_pools/index.md
+++ b/website/docs/services/autoscaling/warm_pools/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>warm_pool</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "auto_scaling_group_name",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>warm_pool</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "auto_scaling_group_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-warmpool.html"><code>AWS::AutoScaling::WarmPool</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>warm_pools</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AutoScalingGroupName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>warm_pools</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>warm_pools</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>warm_pools_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>warm_pools</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>warm_pool</code>.
 ```sql
 SELECT
@@ -126,6 +167,19 @@ instance_reuse_policy
 FROM awscc.autoscaling.warm_pools
 WHERE region = 'us-east-1' AND data__Identifier = '<AutoScalingGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>warm_pools</code> in a region.
+```sql
+SELECT
+region,
+auto_scaling_group_name
+FROM awscc.autoscaling.warm_pools_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -203,6 +257,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.autoscaling.warm_pools
+SET data__PatchDocument = string('{{ {
+    "MaxGroupPreparedCapacity": max_group_prepared_capacity,
+    "MinSize": min_size,
+    "PoolState": pool_state,
+    "InstanceReusePolicy": instance_reuse_policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AutoScalingGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/autoscaling/warm_pools_list_only/index.md b/website/docs/services/autoscaling/warm_pools_list_only/index.md
deleted file mode 100644
index 6d670c987..000000000
--- a/website/docs/services/autoscaling/warm_pools_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: warm_pools_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - warm_pools_list_only
-  - autoscaling
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>warm_pools</code> in a region or regions, for all properties use <a href="/services/autoscaling/warm_pools/"><code>warm_pools</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>warm_pools_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::AutoScaling::WarmPool.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.autoscaling.warm_pools_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "auto_scaling_group_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>warm_pools</code> in a region.
-```sql
-SELECT
-region,
-auto_scaling_group_name
-FROM awscc.autoscaling.warm_pools_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>warm_pools_list_only</code> resource, see <a href="/services/autoscaling/warm_pools/#permissions"><code>warm_pools</code></a>
-
diff --git a/website/docs/services/b2bi/capabilities/index.md b/website/docs/services/b2bi/capabilities/index.md
index c94f4bb53..70c60cacb 100644
--- a/website/docs/services/b2bi/capabilities/index.md
+++ b/website/docs/services/b2bi/capabilities/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>capability</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "capability_arn",
@@ -109,6 +118,23 @@ Creates, updates, deletes or gets a <code>capability</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "capability_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-capability.html"><code>AWS::B2BI::Capability</code></a>.
 
@@ -118,31 +144,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>capabilities</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Configuration, Name, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>capabilities</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>capabilities</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>capabilities_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>capabilities</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +183,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>capability</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ type
 FROM awscc.b2bi.capabilities
 WHERE region = 'us-east-1' AND data__Identifier = '<CapabilityId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>capabilities</code> in a region.
+```sql
+SELECT
+region,
+capability_id
+FROM awscc.b2bi.capabilities_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -251,6 +305,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.b2bi.capabilities
+SET data__PatchDocument = string('{{ {
+    "Configuration": configuration,
+    "InstructionsDocuments": instructions_documents,
+    "Name": name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CapabilityId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/b2bi/capabilities_list_only/index.md b/website/docs/services/b2bi/capabilities_list_only/index.md
deleted file mode 100644
index 274eccbc2..000000000
--- a/website/docs/services/b2bi/capabilities_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: capabilities_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - capabilities_list_only
-  - b2bi
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>capabilities</code> in a region or regions, for all properties use <a href="/services/b2bi/capabilities/"><code>capabilities</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>capabilities_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::B2BI::Capability Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.b2bi.capabilities_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "capability_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>capabilities</code> in a region.
-```sql
-SELECT
-region,
-capability_id
-FROM awscc.b2bi.capabilities_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>capabilities_list_only</code> resource, see <a href="/services/b2bi/capabilities/#permissions"><code>capabilities</code></a>
-
diff --git a/website/docs/services/b2bi/index.md b/website/docs/services/b2bi/index.md
index d2f7c94f7..9d862f2c7 100644
--- a/website/docs/services/b2bi/index.md
+++ b/website/docs/services/b2bi/index.md
@@ -20,7 +20,7 @@ The b2bi service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The b2bi service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/b2bi/capabilities/">capabilities</a><br />
-<a href="/services/b2bi/capabilities_list_only/">capabilities_list_only</a><br />
-<a href="/services/b2bi/partnerships/">partnerships</a><br />
-<a href="/services/b2bi/partnerships_list_only/">partnerships_list_only</a>
+<a href="/services/b2bi/partnerships/">partnerships</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/b2bi/profiles/">profiles</a><br />
-<a href="/services/b2bi/profiles_list_only/">profiles_list_only</a><br />
-<a href="/services/b2bi/transformers/">transformers</a><br />
-<a href="/services/b2bi/transformers_list_only/">transformers_list_only</a>
+<a href="/services/b2bi/transformers/">transformers</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/b2bi/partnerships/index.md b/website/docs/services/b2bi/partnerships/index.md
index 4898ed950..2a0ca3180 100644
--- a/website/docs/services/b2bi/partnerships/index.md
+++ b/website/docs/services/b2bi/partnerships/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>partnership</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "capabilities",
@@ -138,6 +147,23 @@ Creates, updates, deletes or gets a <code>partnership</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "partnership_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-partnership.html"><code>AWS::B2BI::Partnership</code></a>.
 
@@ -147,31 +173,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>partnerships</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Capabilities, Email, Name, ProfileId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>partnerships</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>partnerships</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>partnerships_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>partnerships</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -180,6 +212,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>partnership</code>.
 ```sql
 SELECT
@@ -199,6 +240,19 @@ trading_partner_id
 FROM awscc.b2bi.partnerships
 WHERE region = 'us-east-1' AND data__Identifier = '<PartnershipId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>partnerships</code> in a region.
+```sql
+SELECT
+region,
+partnership_id
+FROM awscc.b2bi.partnerships_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -298,6 +352,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.b2bi.partnerships
+SET data__PatchDocument = string('{{ {
+    "Capabilities": capabilities,
+    "CapabilityOptions": capability_options,
+    "Name": name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PartnershipId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/b2bi/partnerships_list_only/index.md b/website/docs/services/b2bi/partnerships_list_only/index.md
deleted file mode 100644
index 77e5a8c19..000000000
--- a/website/docs/services/b2bi/partnerships_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: partnerships_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - partnerships_list_only
-  - b2bi
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>partnerships</code> in a region or regions, for all properties use <a href="/services/b2bi/partnerships/"><code>partnerships</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>partnerships_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::B2BI::Partnership Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.b2bi.partnerships_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "partnership_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>partnerships</code> in a region.
-```sql
-SELECT
-region,
-partnership_id
-FROM awscc.b2bi.partnerships_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>partnerships_list_only</code> resource, see <a href="/services/b2bi/partnerships/#permissions"><code>partnerships</code></a>
-
diff --git a/website/docs/services/b2bi/profiles/index.md b/website/docs/services/b2bi/profiles/index.md
index 5ef3b6fba..e24b04331 100644
--- a/website/docs/services/b2bi/profiles/index.md
+++ b/website/docs/services/b2bi/profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>profile</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "business_name",
@@ -107,6 +116,23 @@ Creates, updates, deletes or gets a <code>profile</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "profile_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-profile.html"><code>AWS::B2BI::Profile</code></a>.
 
@@ -116,31 +142,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="BusinessName, Logging, Name, Phone, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -149,6 +181,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>profile</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ tags
 FROM awscc.b2bi.profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<ProfileId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>profiles</code> in a region.
+```sql
+SELECT
+region,
+profile_id
+FROM awscc.b2bi.profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -255,6 +309,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.b2bi.profiles
+SET data__PatchDocument = string('{{ {
+    "BusinessName": business_name,
+    "Email": email,
+    "Name": name,
+    "Phone": phone,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ProfileId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/b2bi/profiles_list_only/index.md b/website/docs/services/b2bi/profiles_list_only/index.md
deleted file mode 100644
index 26bebe721..000000000
--- a/website/docs/services/b2bi/profiles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - profiles_list_only
-  - b2bi
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>profiles</code> in a region or regions, for all properties use <a href="/services/b2bi/profiles/"><code>profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::B2BI::Profile Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.b2bi.profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "profile_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>profiles</code> in a region.
-```sql
-SELECT
-region,
-profile_id
-FROM awscc.b2bi.profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>profiles_list_only</code> resource, see <a href="/services/b2bi/profiles/#permissions"><code>profiles</code></a>
-
diff --git a/website/docs/services/b2bi/transformers/index.md b/website/docs/services/b2bi/transformers/index.md
index 548f0b48a..0fb047ca2 100644
--- a/website/docs/services/b2bi/transformers/index.md
+++ b/website/docs/services/b2bi/transformers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transformer</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "created_at",
@@ -235,6 +244,23 @@ Creates, updates, deletes or gets a <code>transformer</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "transformer_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-transformer.html"><code>AWS::B2BI::Transformer</code></a>.
 
@@ -244,31 +270,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transformers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Status, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transformers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>transformers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transformers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transformers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -277,6 +309,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transformer</code>.
 ```sql
 SELECT
@@ -299,6 +340,19 @@ transformer_id
 FROM awscc.b2bi.transformers
 WHERE region = 'us-east-1' AND data__Identifier = '<TransformerId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transformers</code> in a region.
+```sql
+SELECT
+region,
+transformer_id
+FROM awscc.b2bi.transformers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -421,6 +475,29 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.b2bi.transformers
+SET data__PatchDocument = string('{{ {
+    "EdiType": edi_type,
+    "FileFormat": file_format,
+    "InputConversion": input_conversion,
+    "Mapping": mapping,
+    "MappingTemplate": mapping_template,
+    "Name": name,
+    "OutputConversion": output_conversion,
+    "SampleDocument": sample_document,
+    "SampleDocuments": sample_documents,
+    "Status": status,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TransformerId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/b2bi/transformers_list_only/index.md b/website/docs/services/b2bi/transformers_list_only/index.md
deleted file mode 100644
index b847de612..000000000
--- a/website/docs/services/b2bi/transformers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: transformers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transformers_list_only
-  - b2bi
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transformers</code> in a region or regions, for all properties use <a href="/services/b2bi/transformers/"><code>transformers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transformers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::B2BI::Transformer Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.b2bi.transformers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "transformer_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transformers</code> in a region.
-```sql
-SELECT
-region,
-transformer_id
-FROM awscc.b2bi.transformers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transformers_list_only</code> resource, see <a href="/services/b2bi/transformers/#permissions"><code>transformers</code></a>
-
diff --git a/website/docs/services/backup/backup_plans/index.md b/website/docs/services/backup/backup_plans/index.md
index fec96d08f..b64de1eba 100644
--- a/website/docs/services/backup/backup_plans/index.md
+++ b/website/docs/services/backup/backup_plans/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>backup_plan</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "backup_plan",
@@ -187,6 +196,150 @@ Creates, updates, deletes or gets a <code>backup_plan</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "backup_plan",
+    "type": "object",
+    "description": "",
+    "children": [
+      {
+        "name": "backup_plan_name",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "advanced_backup_settings",
+        "type": "array",
+        "description": "",
+        "children": [
+          {
+            "name": "backup_options",
+            "type": "object",
+            "description": ""
+          },
+          {
+            "name": "resource_type",
+            "type": "string",
+            "description": ""
+          }
+        ]
+      },
+      {
+        "name": "backup_plan_rule",
+        "type": "array",
+        "description": "",
+        "children": [
+          {
+            "name": "rule_name",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "target_backup_vault",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "start_window_minutes",
+            "type": "number",
+            "description": ""
+          },
+          {
+            "name": "completion_window_minutes",
+            "type": "number",
+            "description": ""
+          },
+          {
+            "name": "schedule_expression",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "schedule_expression_timezone",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "index_actions",
+            "type": "array",
+            "description": "",
+            "children": [
+              {
+                "name": "resource_types",
+                "type": "array",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "recovery_point_tags",
+            "type": "object",
+            "description": ""
+          },
+          {
+            "name": "copy_actions",
+            "type": "array",
+            "description": "",
+            "children": [
+              {
+                "name": "lifecycle",
+                "type": "object",
+                "description": ""
+              },
+              {
+                "name": "destination_backup_vault_arn",
+                "type": "string",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "lifecycle",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "move_to_cold_storage_after_days",
+                "type": "number",
+                "description": ""
+              },
+              {
+                "name": "delete_after_days",
+                "type": "number",
+                "description": ""
+              },
+              {
+                "name": "opt_in_to_archive_for_supported_resources",
+                "type": "boolean",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "enable_continuous_backup",
+            "type": "boolean",
+            "description": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "backup_plan_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupplan.html"><code>AWS::Backup::BackupPlan</code></a>.
 
@@ -196,31 +349,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>backup_plans</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="BackupPlan, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>backup_plans</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>backup_plans</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>backup_plans_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>backup_plans</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -229,6 +388,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>backup_plan</code>.
 ```sql
 SELECT
@@ -241,6 +409,19 @@ version_id
 FROM awscc.backup.backup_plans
 WHERE region = 'us-east-1' AND data__Identifier = '<BackupPlanId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>backup_plans</code> in a region.
+```sql
+SELECT
+region,
+backup_plan_id
+FROM awscc.backup.backup_plans_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -328,6 +509,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.backup.backup_plans
+SET data__PatchDocument = string('{{ {
+    "BackupPlan": backup_plan,
+    "BackupPlanTags": backup_plan_tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<BackupPlanId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/backup/backup_plans_list_only/index.md b/website/docs/services/backup/backup_plans_list_only/index.md
deleted file mode 100644
index d46edcc2a..000000000
--- a/website/docs/services/backup/backup_plans_list_only/index.md
+++ /dev/null
@@ -1,207 +0,0 @@
----
-title: backup_plans_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - backup_plans_list_only
-  - backup
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>backup_plans</code> in a region or regions, for all properties use <a href="/services/backup/backup_plans/"><code>backup_plans</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>backup_plans_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Backup::BackupPlan</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.backup.backup_plans_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "backup_plan",
-    "type": "object",
-    "description": "",
-    "children": [
-      {
-        "name": "backup_plan_name",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "advanced_backup_settings",
-        "type": "array",
-        "description": "",
-        "children": [
-          {
-            "name": "backup_options",
-            "type": "object",
-            "description": ""
-          },
-          {
-            "name": "resource_type",
-            "type": "string",
-            "description": ""
-          }
-        ]
-      },
-      {
-        "name": "backup_plan_rule",
-        "type": "array",
-        "description": "",
-        "children": [
-          {
-            "name": "rule_name",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "target_backup_vault",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "start_window_minutes",
-            "type": "number",
-            "description": ""
-          },
-          {
-            "name": "completion_window_minutes",
-            "type": "number",
-            "description": ""
-          },
-          {
-            "name": "schedule_expression",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "schedule_expression_timezone",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "index_actions",
-            "type": "array",
-            "description": "",
-            "children": [
-              {
-                "name": "resource_types",
-                "type": "array",
-                "description": ""
-              }
-            ]
-          },
-          {
-            "name": "recovery_point_tags",
-            "type": "object",
-            "description": ""
-          },
-          {
-            "name": "copy_actions",
-            "type": "array",
-            "description": "",
-            "children": [
-              {
-                "name": "lifecycle",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "destination_backup_vault_arn",
-                "type": "string",
-                "description": ""
-              }
-            ]
-          },
-          {
-            "name": "lifecycle",
-            "type": "object",
-            "description": "",
-            "children": [
-              {
-                "name": "move_to_cold_storage_after_days",
-                "type": "number",
-                "description": ""
-              },
-              {
-                "name": "delete_after_days",
-                "type": "number",
-                "description": ""
-              },
-              {
-                "name": "opt_in_to_archive_for_supported_resources",
-                "type": "boolean",
-                "description": ""
-              }
-            ]
-          },
-          {
-            "name": "enable_continuous_backup",
-            "type": "boolean",
-            "description": ""
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "backup_plan_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>backup_plans</code> in a region.
-```sql
-SELECT
-region,
-backup_plan_id
-FROM awscc.backup.backup_plans_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>backup_plans_list_only</code> resource, see <a href="/services/backup/backup_plans/#permissions"><code>backup_plans</code></a>
-
diff --git a/website/docs/services/backup/backup_selections/index.md b/website/docs/services/backup/backup_selections/index.md
index a4c05757a..dc7b342eb 100644
--- a/website/docs/services/backup/backup_selections/index.md
+++ b/website/docs/services/backup/backup_selections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>backup_selection</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -143,6 +152,23 @@ Creates, updates, deletes or gets a <code>backup_selection</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupselection.html"><code>AWS::Backup::BackupSelection</code></a>.
 
@@ -152,26 +178,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>backup_selections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="BackupSelection, BackupPlanId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>backup_selections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>backup_selections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>backup_selections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -180,6 +211,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>backup_selection</code>.
 ```sql
 SELECT
@@ -191,6 +231,19 @@ selection_id
 FROM awscc.backup.backup_selections
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>backup_selections</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.backup.backup_selections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -277,6 +330,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/backup/backup_selections_list_only/index.md b/website/docs/services/backup/backup_selections_list_only/index.md
deleted file mode 100644
index 978ac2d46..000000000
--- a/website/docs/services/backup/backup_selections_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: backup_selections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - backup_selections_list_only
-  - backup
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>backup_selections</code> in a region or regions, for all properties use <a href="/services/backup/backup_selections/"><code>backup_selections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>backup_selections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Backup::BackupSelection</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.backup.backup_selections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>backup_selections</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.backup.backup_selections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>backup_selections_list_only</code> resource, see <a href="/services/backup/backup_selections/#permissions"><code>backup_selections</code></a>
-
diff --git a/website/docs/services/backup/backup_vaults/index.md b/website/docs/services/backup/backup_vaults/index.md
index df8704ac5..a0651e421 100644
--- a/website/docs/services/backup/backup_vaults/index.md
+++ b/website/docs/services/backup/backup_vaults/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>backup_vault</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "access_policy",
@@ -104,6 +113,23 @@ Creates, updates, deletes or gets a <code>backup_vault</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "backup_vault_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupvault.html"><code>AWS::Backup::BackupVault</code></a>.
 
@@ -113,31 +139,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>backup_vaults</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="BackupVaultName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>backup_vaults</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>backup_vaults</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>backup_vaults_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>backup_vaults</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -146,6 +178,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>backup_vault</code>.
 ```sql
 SELECT
@@ -160,6 +201,19 @@ backup_vault_arn
 FROM awscc.backup.backup_vaults
 WHERE region = 'us-east-1' AND data__Identifier = '<BackupVaultName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>backup_vaults</code> in a region.
+```sql
+SELECT
+region,
+backup_vault_name
+FROM awscc.backup.backup_vaults_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -246,6 +300,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.backup.backup_vaults
+SET data__PatchDocument = string('{{ {
+    "AccessPolicy": access_policy,
+    "BackupVaultTags": backup_vault_tags,
+    "Notifications": notifications,
+    "LockConfiguration": lock_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<BackupVaultName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/backup/backup_vaults_list_only/index.md b/website/docs/services/backup/backup_vaults_list_only/index.md
deleted file mode 100644
index 13d3935cb..000000000
--- a/website/docs/services/backup/backup_vaults_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: backup_vaults_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - backup_vaults_list_only
-  - backup
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>backup_vaults</code> in a region or regions, for all properties use <a href="/services/backup/backup_vaults/"><code>backup_vaults</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>backup_vaults_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Backup::BackupVault</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.backup.backup_vaults_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "backup_vault_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>backup_vaults</code> in a region.
-```sql
-SELECT
-region,
-backup_vault_name
-FROM awscc.backup.backup_vaults_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>backup_vaults_list_only</code> resource, see <a href="/services/backup/backup_vaults/#permissions"><code>backup_vaults</code></a>
-
diff --git a/website/docs/services/backup/frameworks/index.md b/website/docs/services/backup/frameworks/index.md
index a6f9f7eaa..46c1df813 100644
--- a/website/docs/services/backup/frameworks/index.md
+++ b/website/docs/services/backup/frameworks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>framework</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "framework_name",
@@ -150,6 +159,23 @@ Creates, updates, deletes or gets a <code>framework</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "framework_arn",
+    "type": "string",
+    "description": "An Amazon Resource Name (ARN) that uniquely identifies Framework as a resource"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-framework.html"><code>AWS::Backup::Framework</code></a>.
 
@@ -159,31 +185,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>frameworks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FrameworkControls, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>frameworks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>frameworks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>frameworks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>frameworks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -192,6 +224,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>framework</code>.
 ```sql
 SELECT
@@ -207,6 +248,19 @@ framework_tags
 FROM awscc.backup.frameworks
 WHERE region = 'us-east-1' AND data__Identifier = '<FrameworkArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>frameworks</code> in a region.
+```sql
+SELECT
+region,
+framework_arn
+FROM awscc.backup.frameworks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -292,6 +346,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.backup.frameworks
+SET data__PatchDocument = string('{{ {
+    "FrameworkDescription": framework_description,
+    "FrameworkControls": framework_controls,
+    "FrameworkTags": framework_tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FrameworkArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/backup/frameworks_list_only/index.md b/website/docs/services/backup/frameworks_list_only/index.md
deleted file mode 100644
index 22fff5dda..000000000
--- a/website/docs/services/backup/frameworks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: frameworks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - frameworks_list_only
-  - backup
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>frameworks</code> in a region or regions, for all properties use <a href="/services/backup/frameworks/"><code>frameworks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>frameworks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Contains detailed information about a framework. Frameworks contain controls, which evaluate and report on your backup events and resources. Frameworks generate daily compliance results.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.backup.frameworks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "framework_arn",
-    "type": "string",
-    "description": "An Amazon Resource Name (ARN) that uniquely identifies Framework as a resource"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>frameworks</code> in a region.
-```sql
-SELECT
-region,
-framework_arn
-FROM awscc.backup.frameworks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>frameworks_list_only</code> resource, see <a href="/services/backup/frameworks/#permissions"><code>frameworks</code></a>
-
diff --git a/website/docs/services/backup/index.md b/website/docs/services/backup/index.md
index cabb3d069..8ca669339 100644
--- a/website/docs/services/backup/index.md
+++ b/website/docs/services/backup/index.md
@@ -20,7 +20,7 @@ The backup service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>16</b></span><br />
+<span>total resources:&nbsp;<b>8</b></span><br />
 </div>
 </div>
 
@@ -30,22 +30,14 @@ The backup service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/backup/backup_plans/">backup_plans</a><br />
-<a href="/services/backup/backup_plans_list_only/">backup_plans_list_only</a><br />
 <a href="/services/backup/backup_selections/">backup_selections</a><br />
-<a href="/services/backup/backup_selections_list_only/">backup_selections_list_only</a><br />
 <a href="/services/backup/backup_vaults/">backup_vaults</a><br />
-<a href="/services/backup/backup_vaults_list_only/">backup_vaults_list_only</a><br />
-<a href="/services/backup/frameworks/">frameworks</a><br />
-<a href="/services/backup/frameworks_list_only/">frameworks_list_only</a>
+<a href="/services/backup/frameworks/">frameworks</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/backup/logically_air_gapped_backup_vaults/">logically_air_gapped_backup_vaults</a><br />
-<a href="/services/backup/logically_air_gapped_backup_vaults_list_only/">logically_air_gapped_backup_vaults_list_only</a><br />
 <a href="/services/backup/report_plans/">report_plans</a><br />
-<a href="/services/backup/report_plans_list_only/">report_plans_list_only</a><br />
 <a href="/services/backup/restore_testing_plans/">restore_testing_plans</a><br />
-<a href="/services/backup/restore_testing_plans_list_only/">restore_testing_plans_list_only</a><br />
-<a href="/services/backup/restore_testing_selections/">restore_testing_selections</a><br />
-<a href="/services/backup/restore_testing_selections_list_only/">restore_testing_selections_list_only</a>
+<a href="/services/backup/restore_testing_selections/">restore_testing_selections</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/backup/logically_air_gapped_backup_vaults/index.md b/website/docs/services/backup/logically_air_gapped_backup_vaults/index.md
index 248f6338f..cc4a35688 100644
--- a/website/docs/services/backup/logically_air_gapped_backup_vaults/index.md
+++ b/website/docs/services/backup/logically_air_gapped_backup_vaults/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>logically_air_gapped_backup_vault</cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "vault_state",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets a <code>logically_air_gapped_backup_vault</cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "backup_vault_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-logicallyairgappedbackupvault.html"><code>AWS::Backup::LogicallyAirGappedBackupVault</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>logically_air_gapped_backup_vaults</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="BackupVaultName, MinRetentionDays, MaxRetentionDays, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>logically_air_gapped_backup_vaults</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>logically_air_gapped_backup_vaults</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>logically_air_gapped_backup_vaults_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>logically_air_gapped_backup_vaults</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>logically_air_gapped_backup_vault</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ access_policy
 FROM awscc.backup.logically_air_gapped_backup_vaults
 WHERE region = 'us-east-1' AND data__Identifier = '<BackupVaultName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>logically_air_gapped_backup_vaults</code> in a region.
+```sql
+SELECT
+region,
+backup_vault_name
+FROM awscc.backup.logically_air_gapped_backup_vaults_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -248,6 +302,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.backup.logically_air_gapped_backup_vaults
+SET data__PatchDocument = string('{{ {
+    "BackupVaultTags": backup_vault_tags,
+    "Notifications": notifications,
+    "AccessPolicy": access_policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<BackupVaultName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/backup/logically_air_gapped_backup_vaults_list_only/index.md b/website/docs/services/backup/logically_air_gapped_backup_vaults_list_only/index.md
deleted file mode 100644
index 00be8df38..000000000
--- a/website/docs/services/backup/logically_air_gapped_backup_vaults_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: logically_air_gapped_backup_vaults_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - logically_air_gapped_backup_vaults_list_only
-  - backup
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>logically_air_gapped_backup_vaults</code> in a region or regions, for all properties use <a href="/services/backup/logically_air_gapped_backup_vaults/"><code>logically_air_gapped_backup_vaults</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>logically_air_gapped_backup_vaults_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Backup::LogicallyAirGappedBackupVault</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.backup.logically_air_gapped_backup_vaults_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "backup_vault_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>logically_air_gapped_backup_vaults</code> in a region.
-```sql
-SELECT
-region,
-backup_vault_name
-FROM awscc.backup.logically_air_gapped_backup_vaults_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>logically_air_gapped_backup_vaults_list_only</code> resource, see <a href="/services/backup/logically_air_gapped_backup_vaults/#permissions"><code>logically_air_gapped_backup_vaults</code></a>
-
diff --git a/website/docs/services/backup/report_plans/index.md b/website/docs/services/backup/report_plans/index.md
index 0fdfcb486..04e0eb981 100644
--- a/website/docs/services/backup/report_plans/index.md
+++ b/website/docs/services/backup/report_plans/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>report_plan</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "report_plan_name",
@@ -126,6 +135,23 @@ Creates, updates, deletes or gets a <code>report_plan</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "report_plan_arn",
+    "type": "string",
+    "description": "An Amazon Resource Name (ARN) that uniquely identifies a resource. The format of the ARN depends on the resource type."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-reportplan.html"><code>AWS::Backup::ReportPlan</code></a>.
 
@@ -135,31 +161,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>report_plans</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ReportDeliveryChannel, ReportSetting, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>report_plans</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>report_plans</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>report_plans_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>report_plans</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -168,6 +200,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>report_plan</code>.
 ```sql
 SELECT
@@ -181,6 +222,19 @@ report_setting
 FROM awscc.backup.report_plans
 WHERE region = 'us-east-1' AND data__Identifier = '<ReportPlanArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>report_plans</code> in a region.
+```sql
+SELECT
+region,
+report_plan_arn
+FROM awscc.backup.report_plans_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -274,6 +328,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.backup.report_plans
+SET data__PatchDocument = string('{{ {
+    "ReportPlanDescription": report_plan_description,
+    "ReportPlanTags": report_plan_tags,
+    "ReportDeliveryChannel": report_delivery_channel,
+    "ReportSetting": report_setting
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ReportPlanArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/backup/report_plans_list_only/index.md b/website/docs/services/backup/report_plans_list_only/index.md
deleted file mode 100644
index 05815e0e8..000000000
--- a/website/docs/services/backup/report_plans_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: report_plans_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - report_plans_list_only
-  - backup
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>report_plans</code> in a region or regions, for all properties use <a href="/services/backup/report_plans/"><code>report_plans</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>report_plans_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Contains detailed information about a report plan in AWS Backup Audit Manager.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.backup.report_plans_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "report_plan_arn",
-    "type": "string",
-    "description": "An Amazon Resource Name (ARN) that uniquely identifies a resource. The format of the ARN depends on the resource type."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>report_plans</code> in a region.
-```sql
-SELECT
-region,
-report_plan_arn
-FROM awscc.backup.report_plans_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>report_plans_list_only</code> resource, see <a href="/services/backup/report_plans/#permissions"><code>report_plans</code></a>
-
diff --git a/website/docs/services/backup/restore_testing_plans/index.md b/website/docs/services/backup/restore_testing_plans/index.md
index 12def4f3b..1eb879a73 100644
--- a/website/docs/services/backup/restore_testing_plans/index.md
+++ b/website/docs/services/backup/restore_testing_plans/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>restore_testing_plan</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "schedule_expression",
@@ -114,6 +123,23 @@ Creates, updates, deletes or gets a <code>restore_testing_plan</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "restore_testing_plan_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-restoretestingplan.html"><code>AWS::Backup::RestoreTestingPlan</code></a>.
 
@@ -123,31 +149,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>restore_testing_plans</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RecoveryPointSelection, ScheduleExpression, RestoreTestingPlanName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>restore_testing_plans</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>restore_testing_plans</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>restore_testing_plans_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>restore_testing_plans</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +188,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>restore_testing_plan</code>.
 ```sql
 SELECT
@@ -170,6 +211,19 @@ tags
 FROM awscc.backup.restore_testing_plans
 WHERE region = 'us-east-1' AND data__Identifier = '<RestoreTestingPlanName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>restore_testing_plans</code> in a region.
+```sql
+SELECT
+region,
+restore_testing_plan_name
+FROM awscc.backup.restore_testing_plans_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -264,6 +318,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.backup.restore_testing_plans
+SET data__PatchDocument = string('{{ {
+    "ScheduleExpression": schedule_expression,
+    "StartWindowHours": start_window_hours,
+    "RecoveryPointSelection": recovery_point_selection,
+    "ScheduleExpressionTimezone": schedule_expression_timezone,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RestoreTestingPlanName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/backup/restore_testing_plans_list_only/index.md b/website/docs/services/backup/restore_testing_plans_list_only/index.md
deleted file mode 100644
index 6cdb86da4..000000000
--- a/website/docs/services/backup/restore_testing_plans_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: restore_testing_plans_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - restore_testing_plans_list_only
-  - backup
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>restore_testing_plans</code> in a region or regions, for all properties use <a href="/services/backup/restore_testing_plans/"><code>restore_testing_plans</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>restore_testing_plans_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Backup::RestoreTestingPlan Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.backup.restore_testing_plans_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "restore_testing_plan_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>restore_testing_plans</code> in a region.
-```sql
-SELECT
-region,
-restore_testing_plan_name
-FROM awscc.backup.restore_testing_plans_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>restore_testing_plans_list_only</code> resource, see <a href="/services/backup/restore_testing_plans/#permissions"><code>restore_testing_plans</code></a>
-
diff --git a/website/docs/services/backup/restore_testing_selections/index.md b/website/docs/services/backup/restore_testing_selections/index.md
index ef29d6583..700311a93 100644
--- a/website/docs/services/backup/restore_testing_selections/index.md
+++ b/website/docs/services/backup/restore_testing_selections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>restore_testing_selection</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "iam_role_arn",
@@ -104,6 +113,28 @@ Creates, updates, deletes or gets a <code>restore_testing_selection</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "restore_testing_plan_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "restore_testing_selection_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-restoretestingselection.html"><code>AWS::Backup::RestoreTestingSelection</code></a>.
 
@@ -113,31 +144,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>restore_testing_selections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IamRoleArn, ProtectedResourceType, RestoreTestingPlanName, RestoreTestingSelectionName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>restore_testing_selections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>restore_testing_selections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>restore_testing_selections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>restore_testing_selections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -146,6 +183,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>restore_testing_selection</code>.
 ```sql
 SELECT
@@ -161,6 +207,20 @@ validation_window_hours
 FROM awscc.backup.restore_testing_selections
 WHERE region = 'us-east-1' AND data__Identifier = '<RestoreTestingPlanName>|<RestoreTestingSelectionName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>restore_testing_selections</code> in a region.
+```sql
+SELECT
+region,
+restore_testing_plan_name,
+restore_testing_selection_name
+FROM awscc.backup.restore_testing_selections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -261,6 +321,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.backup.restore_testing_selections
+SET data__PatchDocument = string('{{ {
+    "IamRoleArn": iam_role_arn,
+    "ProtectedResourceArns": protected_resource_arns,
+    "ProtectedResourceConditions": protected_resource_conditions,
+    "RestoreMetadataOverrides": restore_metadata_overrides,
+    "ValidationWindowHours": validation_window_hours
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RestoreTestingPlanName>|<RestoreTestingSelectionName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/backup/restore_testing_selections_list_only/index.md b/website/docs/services/backup/restore_testing_selections_list_only/index.md
deleted file mode 100644
index 63fc2a84d..000000000
--- a/website/docs/services/backup/restore_testing_selections_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: restore_testing_selections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - restore_testing_selections_list_only
-  - backup
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>restore_testing_selections</code> in a region or regions, for all properties use <a href="/services/backup/restore_testing_selections/"><code>restore_testing_selections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>restore_testing_selections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Backup::RestoreTestingSelection</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.backup.restore_testing_selections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "restore_testing_plan_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "restore_testing_selection_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>restore_testing_selections</code> in a region.
-```sql
-SELECT
-region,
-restore_testing_plan_name,
-restore_testing_selection_name
-FROM awscc.backup.restore_testing_selections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>restore_testing_selections_list_only</code> resource, see <a href="/services/backup/restore_testing_selections/#permissions"><code>restore_testing_selections</code></a>
-
diff --git a/website/docs/services/backupgateway/hypervisors/index.md b/website/docs/services/backupgateway/hypervisors/index.md
index 82f9b3448..25d43898e 100644
--- a/website/docs/services/backupgateway/hypervisors/index.md
+++ b/website/docs/services/backupgateway/hypervisors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>hypervisor</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "host",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>hypervisor</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "hypervisor_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backupgateway-hypervisor.html"><code>AWS::BackupGateway::Hypervisor</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>hypervisors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>hypervisors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>hypervisors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>hypervisors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>hypervisors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>hypervisor</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ username
 FROM awscc.backupgateway.hypervisors
 WHERE region = 'us-east-1' AND data__Identifier = '<HypervisorArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>hypervisors</code> in a region.
+```sql
+SELECT
+region,
+hypervisor_arn
+FROM awscc.backupgateway.hypervisors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -247,6 +301,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.backupgateway.hypervisors
+SET data__PatchDocument = string('{{ {
+    "Host": host,
+    "LogGroupArn": log_group_arn,
+    "Name": name,
+    "Password": password,
+    "Username": username
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<HypervisorArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/backupgateway/hypervisors_list_only/index.md b/website/docs/services/backupgateway/hypervisors_list_only/index.md
deleted file mode 100644
index a7209e405..000000000
--- a/website/docs/services/backupgateway/hypervisors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: hypervisors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - hypervisors_list_only
-  - backupgateway
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>hypervisors</code> in a region or regions, for all properties use <a href="/services/backupgateway/hypervisors/"><code>hypervisors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>hypervisors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::BackupGateway::Hypervisor Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.backupgateway.hypervisors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "hypervisor_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>hypervisors</code> in a region.
-```sql
-SELECT
-region,
-hypervisor_arn
-FROM awscc.backupgateway.hypervisors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>hypervisors_list_only</code> resource, see <a href="/services/backupgateway/hypervisors/#permissions"><code>hypervisors</code></a>
-
diff --git a/website/docs/services/backupgateway/index.md b/website/docs/services/backupgateway/index.md
index 45c5ec232..8c2320cf6 100644
--- a/website/docs/services/backupgateway/index.md
+++ b/website/docs/services/backupgateway/index.md
@@ -20,7 +20,7 @@ The backupgateway service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The backupgateway service documentation.
 <a href="/services/backupgateway/hypervisors/">hypervisors</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/backupgateway/hypervisors_list_only/">hypervisors_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/batch/compute_environments/index.md b/website/docs/services/batch/compute_environments/index.md
index 6c8294e5d..fefb19790 100644
--- a/website/docs/services/batch/compute_environments/index.md
+++ b/website/docs/services/batch/compute_environments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>compute_environment</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "compute_environment_arn",
@@ -287,6 +296,23 @@ Creates, updates, deletes or gets a <code>compute_environment</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "compute_environment_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html"><code>AWS::Batch::ComputeEnvironment</code></a>.
 
@@ -296,31 +322,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>compute_environments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>compute_environments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>compute_environments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>compute_environments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>compute_environments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -329,6 +361,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>compute_environment</code>.
 ```sql
 SELECT
@@ -348,6 +389,19 @@ context
 FROM awscc.batch.compute_environments
 WHERE region = 'us-east-1' AND data__Identifier = '<ComputeEnvironmentArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>compute_environments</code> in a region.
+```sql
+SELECT
+region,
+compute_environment_arn
+FROM awscc.batch.compute_environments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -487,6 +541,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.batch.compute_environments
+SET data__PatchDocument = string('{{ {
+    "ReplaceComputeEnvironment": replace_compute_environment,
+    "ServiceRole": service_role,
+    "State": state,
+    "UpdatePolicy": update_policy,
+    "UnmanagedvCpus": unmanagedv_cpus,
+    "Context": context
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ComputeEnvironmentArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/batch/compute_environments_list_only/index.md b/website/docs/services/batch/compute_environments_list_only/index.md
deleted file mode 100644
index 70bad43bf..000000000
--- a/website/docs/services/batch/compute_environments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: compute_environments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - compute_environments_list_only
-  - batch
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>compute_environments</code> in a region or regions, for all properties use <a href="/services/batch/compute_environments/"><code>compute_environments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>compute_environments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Batch::ComputeEnvironment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.batch.compute_environments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "compute_environment_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>compute_environments</code> in a region.
-```sql
-SELECT
-region,
-compute_environment_arn
-FROM awscc.batch.compute_environments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>compute_environments_list_only</code> resource, see <a href="/services/batch/compute_environments/#permissions"><code>compute_environments</code></a>
-
diff --git a/website/docs/services/batch/consumable_resources/index.md b/website/docs/services/batch/consumable_resources/index.md
index 622201e94..96221acab 100644
--- a/website/docs/services/batch/consumable_resources/index.md
+++ b/website/docs/services/batch/consumable_resources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>consumable_resource</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "consumable_resource_name",
@@ -80,6 +89,23 @@ Creates, updates, deletes or gets a <code>consumable_resource</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "consumable_resource_arn",
+    "type": "string",
+    "description": "ARN of the Scheduling Policy."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-consumableresource.html"><code>AWS::Batch::ConsumableResource</code></a>.
 
@@ -89,31 +115,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>consumable_resources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResourceType, TotalQuantity, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>consumable_resources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>consumable_resources</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>consumable_resources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>consumable_resources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -122,6 +154,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>consumable_resource</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.batch.consumable_resources
 WHERE region = 'us-east-1' AND data__Identifier = '<ConsumableResourceArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>consumable_resources</code> in a region.
+```sql
+SELECT
+region,
+consumable_resource_arn
+FROM awscc.batch.consumable_resources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -211,6 +265,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.batch.consumable_resources
+SET data__PatchDocument = string('{{ {
+    "TotalQuantity": total_quantity
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConsumableResourceArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/batch/consumable_resources_list_only/index.md b/website/docs/services/batch/consumable_resources_list_only/index.md
deleted file mode 100644
index b952b195d..000000000
--- a/website/docs/services/batch/consumable_resources_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: consumable_resources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - consumable_resources_list_only
-  - batch
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>consumable_resources</code> in a region or regions, for all properties use <a href="/services/batch/consumable_resources/"><code>consumable_resources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>consumable_resources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Batch::ConsumableResource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.batch.consumable_resources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "consumable_resource_arn",
-    "type": "string",
-    "description": "ARN of the Scheduling Policy."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>consumable_resources</code> in a region.
-```sql
-SELECT
-region,
-consumable_resource_arn
-FROM awscc.batch.consumable_resources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>consumable_resources_list_only</code> resource, see <a href="/services/batch/consumable_resources/#permissions"><code>consumable_resources</code></a>
-
diff --git a/website/docs/services/batch/index.md b/website/docs/services/batch/index.md
index 589314525..a5b248c6b 100644
--- a/website/docs/services/batch/index.md
+++ b/website/docs/services/batch/index.md
@@ -20,7 +20,7 @@ The batch service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>12</b></span><br />
+<span>total resources:&nbsp;<b>6</b></span><br />
 </div>
 </div>
 
@@ -30,18 +30,12 @@ The batch service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/batch/compute_environments/">compute_environments</a><br />
-<a href="/services/batch/compute_environments_list_only/">compute_environments_list_only</a><br />
 <a href="/services/batch/consumable_resources/">consumable_resources</a><br />
-<a href="/services/batch/consumable_resources_list_only/">consumable_resources_list_only</a><br />
-<a href="/services/batch/job_definitions/">job_definitions</a><br />
-<a href="/services/batch/job_definitions_list_only/">job_definitions_list_only</a>
+<a href="/services/batch/job_definitions/">job_definitions</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/batch/job_queues/">job_queues</a><br />
-<a href="/services/batch/job_queues_list_only/">job_queues_list_only</a><br />
 <a href="/services/batch/scheduling_policies/">scheduling_policies</a><br />
-<a href="/services/batch/scheduling_policies_list_only/">scheduling_policies_list_only</a><br />
-<a href="/services/batch/service_environments/">service_environments</a><br />
-<a href="/services/batch/service_environments_list_only/">service_environments_list_only</a>
+<a href="/services/batch/service_environments/">service_environments</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/batch/job_definitions/index.md b/website/docs/services/batch/job_definitions/index.md
index 4e7391938..5ace1d564 100644
--- a/website/docs/services/batch/job_definitions/index.md
+++ b/website/docs/services/batch/job_definitions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>job_definition</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "container_properties",
@@ -1076,6 +1085,23 @@ Creates, updates, deletes or gets a <code>job_definition</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "job_definition_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html"><code>AWS::Batch::JobDefinition</code></a>.
 
@@ -1085,31 +1111,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>job_definitions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>job_definitions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>job_definitions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>job_definitions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>job_definitions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -1118,6 +1150,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>job_definition</code>.
 ```sql
 SELECT
@@ -1140,6 +1181,19 @@ consumable_resource_properties
 FROM awscc.batch.job_definitions
 WHERE region = 'us-east-1' AND data__Identifier = '<JobDefinitionName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>job_definitions</code> in a region.
+```sql
+SELECT
+region,
+job_definition_name
+FROM awscc.batch.job_definitions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1475,6 +1529,31 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.batch.job_definitions
+SET data__PatchDocument = string('{{ {
+    "ContainerProperties": container_properties,
+    "EcsProperties": ecs_properties,
+    "NodeProperties": node_properties,
+    "SchedulingPriority": scheduling_priority,
+    "Parameters": parameters,
+    "PlatformCapabilities": platform_capabilities,
+    "PropagateTags": propagate_tags,
+    "RetryStrategy": retry_strategy,
+    "Timeout": timeout,
+    "Type": type,
+    "Tags": tags,
+    "EksProperties": eks_properties,
+    "ConsumableResourceProperties": consumable_resource_properties
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<JobDefinitionName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/batch/job_definitions_list_only/index.md b/website/docs/services/batch/job_definitions_list_only/index.md
deleted file mode 100644
index fd6a10bae..000000000
--- a/website/docs/services/batch/job_definitions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: job_definitions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - job_definitions_list_only
-  - batch
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>job_definitions</code> in a region or regions, for all properties use <a href="/services/batch/job_definitions/"><code>job_definitions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>job_definitions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Batch::JobDefinition</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.batch.job_definitions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "job_definition_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>job_definitions</code> in a region.
-```sql
-SELECT
-region,
-job_definition_name
-FROM awscc.batch.job_definitions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>job_definitions_list_only</code> resource, see <a href="/services/batch/job_definitions/#permissions"><code>job_definitions</code></a>
-
diff --git a/website/docs/services/batch/job_queues/index.md b/website/docs/services/batch/job_queues/index.md
index de35547bd..e31cc88a6 100644
--- a/website/docs/services/batch/job_queues/index.md
+++ b/website/docs/services/batch/job_queues/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>job_queue</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "job_queue_name",
@@ -131,6 +140,23 @@ Creates, updates, deletes or gets a <code>job_queue</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "job_queue_arn",
+    "type": "string",
+    "description": "ARN of the Scheduling Policy."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html"><code>AWS::Batch::JobQueue</code></a>.
 
@@ -140,31 +166,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>job_queues</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Priority, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>job_queues</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>job_queues</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>job_queues_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>job_queues</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -173,6 +205,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>job_queue</code>.
 ```sql
 SELECT
@@ -190,6 +231,19 @@ tags
 FROM awscc.batch.job_queues
 WHERE region = 'us-east-1' AND data__Identifier = '<JobQueueArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>job_queues</code> in a region.
+```sql
+SELECT
+region,
+job_queue_arn
+FROM awscc.batch.job_queues_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -290,6 +344,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.batch.job_queues
+SET data__PatchDocument = string('{{ {
+    "ComputeEnvironmentOrder": compute_environment_order,
+    "ServiceEnvironmentOrder": service_environment_order,
+    "JobStateTimeLimitActions": job_state_time_limit_actions,
+    "Priority": priority,
+    "State": state,
+    "SchedulingPolicyArn": scheduling_policy_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<JobQueueArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/batch/job_queues_list_only/index.md b/website/docs/services/batch/job_queues_list_only/index.md
deleted file mode 100644
index 30480ae65..000000000
--- a/website/docs/services/batch/job_queues_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: job_queues_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - job_queues_list_only
-  - batch
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>job_queues</code> in a region or regions, for all properties use <a href="/services/batch/job_queues/"><code>job_queues</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>job_queues_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Batch::JobQueue</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.batch.job_queues_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "job_queue_arn",
-    "type": "string",
-    "description": "ARN of the Scheduling Policy."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>job_queues</code> in a region.
-```sql
-SELECT
-region,
-job_queue_arn
-FROM awscc.batch.job_queues_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>job_queues_list_only</code> resource, see <a href="/services/batch/job_queues/#permissions"><code>job_queues</code></a>
-
diff --git a/website/docs/services/batch/scheduling_policies/index.md b/website/docs/services/batch/scheduling_policies/index.md
index db003627f..973878ffc 100644
--- a/website/docs/services/batch/scheduling_policies/index.md
+++ b/website/docs/services/batch/scheduling_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>scheduling_policy</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -89,6 +98,23 @@ Creates, updates, deletes or gets a <code>scheduling_policy</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "ARN of the Scheduling Policy."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-schedulingpolicy.html"><code>AWS::Batch::SchedulingPolicy</code></a>.
 
@@ -98,31 +124,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>scheduling_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>scheduling_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>scheduling_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>scheduling_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>scheduling_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -131,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>scheduling_policy</code>.
 ```sql
 SELECT
@@ -142,6 +183,19 @@ tags
 FROM awscc.batch.scheduling_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>scheduling_policies</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.batch.scheduling_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.batch.scheduling_policies
+SET data__PatchDocument = string('{{ {
+    "FairsharePolicy": fairshare_policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/batch/scheduling_policies_list_only/index.md b/website/docs/services/batch/scheduling_policies_list_only/index.md
deleted file mode 100644
index a515449d5..000000000
--- a/website/docs/services/batch/scheduling_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: scheduling_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - scheduling_policies_list_only
-  - batch
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>scheduling_policies</code> in a region or regions, for all properties use <a href="/services/batch/scheduling_policies/"><code>scheduling_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>scheduling_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Batch::SchedulingPolicy</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.batch.scheduling_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "ARN of the Scheduling Policy."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>scheduling_policies</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.batch.scheduling_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>scheduling_policies_list_only</code> resource, see <a href="/services/batch/scheduling_policies/#permissions"><code>scheduling_policies</code></a>
-
diff --git a/website/docs/services/batch/service_environments/index.md b/website/docs/services/batch/service_environments/index.md
index 30c362459..6bd207633 100644
--- a/website/docs/services/batch/service_environments/index.md
+++ b/website/docs/services/batch/service_environments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>service_environment</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "service_environment_arn",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>service_environment</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "service_environment_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-serviceenvironment.html"><code>AWS::Batch::ServiceEnvironment</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>service_environments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ServiceEnvironmentType, CapacityLimits, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>service_environments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>service_environments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>service_environments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>service_environments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>service_environment</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.batch.service_environments
 WHERE region = 'us-east-1' AND data__Identifier = '<ServiceEnvironmentArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>service_environments</code> in a region.
+```sql
+SELECT
+region,
+service_environment_arn
+FROM awscc.batch.service_environments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +271,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.batch.service_environments
+SET data__PatchDocument = string('{{ {
+    "State": state,
+    "CapacityLimits": capacity_limits,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ServiceEnvironmentArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/batch/service_environments_list_only/index.md b/website/docs/services/batch/service_environments_list_only/index.md
deleted file mode 100644
index 3ebd66a0e..000000000
--- a/website/docs/services/batch/service_environments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: service_environments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - service_environments_list_only
-  - batch
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>service_environments</code> in a region or regions, for all properties use <a href="/services/batch/service_environments/"><code>service_environments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>service_environments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Batch::ServiceEnvironment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.batch.service_environments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "service_environment_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>service_environments</code> in a region.
-```sql
-SELECT
-region,
-service_environment_arn
-FROM awscc.batch.service_environments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>service_environments_list_only</code> resource, see <a href="/services/batch/service_environments/#permissions"><code>service_environments</code></a>
-
diff --git a/website/docs/services/bcmdataexports/exports/index.md b/website/docs/services/bcmdataexports/exports/index.md
index f1b132a5c..7dad070eb 100644
--- a/website/docs/services/bcmdataexports/exports/index.md
+++ b/website/docs/services/bcmdataexports/exports/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>export</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "export",
@@ -91,6 +100,52 @@ Creates, updates, deletes or gets an <code>export</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "export",
+    "type": "object",
+    "description": "Definition of AWS::BCMDataExports::Export Resource Type",
+    "children": [
+      {
+        "name": "export_arn",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "tags",
+        "type": "array",
+        "description": "",
+        "children": [
+          {
+            "name": "key",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "value",
+            "type": "string",
+            "description": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "export_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bcmdataexports-export.html"><code>AWS::BCMDataExports::Export</code></a>.
 
@@ -100,31 +155,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>exports</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Export, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>exports</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>exports</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>exports_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>exports</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -133,6 +194,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>export</code>.
 ```sql
 SELECT
@@ -143,6 +213,19 @@ tags
 FROM awscc.bcmdataexports.exports
 WHERE region = 'us-east-1' AND data__Identifier = '<ExportArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>exports</code> in a region.
+```sql
+SELECT
+region,
+export_arn
+FROM awscc.bcmdataexports.exports_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -212,6 +295,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.bcmdataexports.exports
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ExportArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bcmdataexports/exports_list_only/index.md b/website/docs/services/bcmdataexports/exports_list_only/index.md
deleted file mode 100644
index 6d1606d6d..000000000
--- a/website/docs/services/bcmdataexports/exports_list_only/index.md
+++ /dev/null
@@ -1,109 +0,0 @@
----
-title: exports_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - exports_list_only
-  - bcmdataexports
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>exports</code> in a region or regions, for all properties use <a href="/services/bcmdataexports/exports/"><code>exports</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>exports_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::BCMDataExports::Export Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bcmdataexports.exports_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "export",
-    "type": "object",
-    "description": "Definition of AWS::BCMDataExports::Export Resource Type",
-    "children": [
-      {
-        "name": "export_arn",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "",
-        "children": [
-          {
-            "name": "key",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "value",
-            "type": "string",
-            "description": ""
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "export_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>exports</code> in a region.
-```sql
-SELECT
-region,
-export_arn
-FROM awscc.bcmdataexports.exports_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>exports_list_only</code> resource, see <a href="/services/bcmdataexports/exports/#permissions"><code>exports</code></a>
-
diff --git a/website/docs/services/bcmdataexports/index.md b/website/docs/services/bcmdataexports/index.md
index 56657ef55..1ba7b9e76 100644
--- a/website/docs/services/bcmdataexports/index.md
+++ b/website/docs/services/bcmdataexports/index.md
@@ -20,7 +20,7 @@ The bcmdataexports service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The bcmdataexports service documentation.
 <a href="/services/bcmdataexports/exports/">exports</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/bcmdataexports/exports_list_only/">exports_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/bedrock/agent_aliases/index.md b/website/docs/services/bedrock/agent_aliases/index.md
index 088b9d105..40839e84c 100644
--- a/website/docs/services/bedrock/agent_aliases/index.md
+++ b/website/docs/services/bedrock/agent_aliases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>agent_alias</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "agent_alias_arn",
@@ -126,6 +135,28 @@ Creates, updates, deletes or gets an <code>agent_alias</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "agent_alias_id",
+    "type": "string",
+    "description": "Id for an Agent Alias generated at the server side."
+  },
+  {
+    "name": "agent_id",
+    "type": "string",
+    "description": "Identifier for a resource."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-agentalias.html"><code>AWS::Bedrock::AgentAlias</code></a>.
 
@@ -135,31 +166,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>agent_aliases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AgentAliasName, AgentId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>agent_aliases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>agent_aliases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>agent_aliases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>agent_aliases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -168,6 +205,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>agent_alias</code>.
 ```sql
 SELECT
@@ -186,6 +232,20 @@ updated_at
 FROM awscc.bedrock.agent_aliases
 WHERE region = 'us-east-1' AND data__Identifier = '<AgentId>|<AgentAliasId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>agent_aliases</code> in a region.
+```sql
+SELECT
+region,
+agent_id,
+agent_alias_id
+FROM awscc.bedrock.agent_aliases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -265,6 +325,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.bedrock.agent_aliases
+SET data__PatchDocument = string('{{ {
+    "AgentAliasName": agent_alias_name,
+    "Description": description,
+    "RoutingConfiguration": routing_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AgentId>|<AgentAliasId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/agent_aliases_list_only/index.md b/website/docs/services/bedrock/agent_aliases_list_only/index.md
deleted file mode 100644
index e568b963e..000000000
--- a/website/docs/services/bedrock/agent_aliases_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: agent_aliases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - agent_aliases_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>agent_aliases</code> in a region or regions, for all properties use <a href="/services/bedrock/agent_aliases/"><code>agent_aliases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>agent_aliases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::AgentAlias Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.agent_aliases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "agent_alias_id",
-    "type": "string",
-    "description": "Id for an Agent Alias generated at the server side."
-  },
-  {
-    "name": "agent_id",
-    "type": "string",
-    "description": "Identifier for a resource."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>agent_aliases</code> in a region.
-```sql
-SELECT
-region,
-agent_id,
-agent_alias_id
-FROM awscc.bedrock.agent_aliases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>agent_aliases_list_only</code> resource, see <a href="/services/bedrock/agent_aliases/#permissions"><code>agent_aliases</code></a>
-
diff --git a/website/docs/services/bedrock/agents/index.md b/website/docs/services/bedrock/agents/index.md
index 53216f6d6..69ac8f121 100644
--- a/website/docs/services/bedrock/agents/index.md
+++ b/website/docs/services/bedrock/agents/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>agent</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "action_groups",
@@ -418,6 +427,23 @@ Creates, updates, deletes or gets an <code>agent</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "agent_id",
+    "type": "string",
+    "description": "Identifier for a resource."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-agent.html"><code>AWS::Bedrock::Agent</code></a>.
 
@@ -427,31 +453,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>agents</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AgentName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>agents</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>agents</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>agents_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>agents</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -460,6 +492,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>agent</code>.
 ```sql
 SELECT
@@ -496,6 +537,19 @@ updated_at
 FROM awscc.bedrock.agents
 WHERE region = 'us-east-1' AND data__Identifier = '<AgentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>agents</code> in a region.
+```sql
+SELECT
+region,
+agent_id
+FROM awscc.bedrock.agents_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -678,6 +732,38 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.bedrock.agents
+SET data__PatchDocument = string('{{ {
+    "ActionGroups": action_groups,
+    "AgentName": agent_name,
+    "AgentResourceRoleArn": agent_resource_role_arn,
+    "AutoPrepare": auto_prepare,
+    "CustomOrchestration": custom_orchestration,
+    "CustomerEncryptionKeyArn": customer_encryption_key_arn,
+    "SkipResourceInUseCheckOnDelete": skip_resource_in_use_check_on_delete,
+    "Description": description,
+    "FoundationModel": foundation_model,
+    "GuardrailConfiguration": guardrail_configuration,
+    "MemoryConfiguration": memory_configuration,
+    "IdleSessionTTLInSeconds": idle_session_ttl_in_seconds,
+    "AgentCollaboration": agent_collaboration,
+    "Instruction": instruction,
+    "KnowledgeBases": knowledge_bases,
+    "AgentCollaborators": agent_collaborators,
+    "OrchestrationType": orchestration_type,
+    "PromptOverrideConfiguration": prompt_override_configuration,
+    "Tags": tags,
+    "TestAliasTags": test_alias_tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AgentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/agents_list_only/index.md b/website/docs/services/bedrock/agents_list_only/index.md
deleted file mode 100644
index bfdf3ca20..000000000
--- a/website/docs/services/bedrock/agents_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: agents_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - agents_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>agents</code> in a region or regions, for all properties use <a href="/services/bedrock/agents/"><code>agents</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>agents_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::Agent Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.agents_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "agent_id",
-    "type": "string",
-    "description": "Identifier for a resource."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>agents</code> in a region.
-```sql
-SELECT
-region,
-agent_id
-FROM awscc.bedrock.agents_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>agents_list_only</code> resource, see <a href="/services/bedrock/agents/#permissions"><code>agents</code></a>
-
diff --git a/website/docs/services/bedrock/application_inference_profiles/index.md b/website/docs/services/bedrock/application_inference_profiles/index.md
index c6e1ce4e8..1e37c8e26 100644
--- a/website/docs/services/bedrock/application_inference_profiles/index.md
+++ b/website/docs/services/bedrock/application_inference_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application_inference_profile</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "created_at",
@@ -119,6 +128,28 @@ Creates, updates, deletes or gets an <code>application_inference_profile</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "inference_profile_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "inference_profile_identifier",
+    "type": "string",
+    "description": "Inference profile identifier. Supports both system-defined inference profile ids, and inference profile ARNs."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-applicationinferenceprofile.html"><code>AWS::Bedrock::ApplicationInferenceProfile</code></a>.
 
@@ -128,31 +159,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>application_inference_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InferenceProfileName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>application_inference_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>application_inference_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>application_inference_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>application_inference_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +198,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application_inference_profile</code>.
 ```sql
 SELECT
@@ -180,6 +226,19 @@ updated_at
 FROM awscc.bedrock.application_inference_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<InferenceProfileIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>application_inference_profiles</code> in a region.
+```sql
+SELECT
+region,
+inference_profile_identifier
+FROM awscc.bedrock.application_inference_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -254,6 +313,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.bedrock.application_inference_profiles
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InferenceProfileIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/application_inference_profiles_list_only/index.md b/website/docs/services/bedrock/application_inference_profiles_list_only/index.md
deleted file mode 100644
index e5478669d..000000000
--- a/website/docs/services/bedrock/application_inference_profiles_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: application_inference_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - application_inference_profiles_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>application_inference_profiles</code> in a region or regions, for all properties use <a href="/services/bedrock/application_inference_profiles/"><code>application_inference_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>application_inference_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::ApplicationInferenceProfile Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.application_inference_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "inference_profile_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "inference_profile_identifier",
-    "type": "string",
-    "description": "Inference profile identifier. Supports both system-defined inference profile ids, and inference profile ARNs."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>application_inference_profiles</code> in a region.
-```sql
-SELECT
-region,
-inference_profile_identifier
-FROM awscc.bedrock.application_inference_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>application_inference_profiles_list_only</code> resource, see <a href="/services/bedrock/application_inference_profiles/#permissions"><code>application_inference_profiles</code></a>
-
diff --git a/website/docs/services/bedrock/automated_reasoning_policies/index.md b/website/docs/services/bedrock/automated_reasoning_policies/index.md
index 003386d8f..6c419438d 100644
--- a/website/docs/services/bedrock/automated_reasoning_policies/index.md
+++ b/website/docs/services/bedrock/automated_reasoning_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>automated_reasoning_policy</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -187,6 +196,23 @@ Creates, updates, deletes or gets an <code>automated_reasoning_policy</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "policy_arn",
+    "type": "string",
+    "description": "Arn of the policy"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-automatedreasoningpolicy.html"><code>AWS::Bedrock::AutomatedReasoningPolicy</code></a>.
 
@@ -196,31 +222,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>automated_reasoning_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>automated_reasoning_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>automated_reasoning_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>automated_reasoning_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>automated_reasoning_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -229,6 +261,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>automated_reasoning_policy</code>.
 ```sql
 SELECT
@@ -246,6 +287,19 @@ tags
 FROM awscc.bedrock.automated_reasoning_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<PolicyArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>automated_reasoning_policies</code> in a region.
+```sql
+SELECT
+region,
+policy_arn
+FROM awscc.bedrock.automated_reasoning_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -335,6 +389,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.bedrock.automated_reasoning_policies
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "PolicyDefinition": policy_definition,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PolicyArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/automated_reasoning_policies_list_only/index.md b/website/docs/services/bedrock/automated_reasoning_policies_list_only/index.md
deleted file mode 100644
index 1ebab3735..000000000
--- a/website/docs/services/bedrock/automated_reasoning_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: automated_reasoning_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - automated_reasoning_policies_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>automated_reasoning_policies</code> in a region or regions, for all properties use <a href="/services/bedrock/automated_reasoning_policies/"><code>automated_reasoning_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>automated_reasoning_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::AutomatedReasoningPolicy Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.automated_reasoning_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "policy_arn",
-    "type": "string",
-    "description": "Arn of the policy"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>automated_reasoning_policies</code> in a region.
-```sql
-SELECT
-region,
-policy_arn
-FROM awscc.bedrock.automated_reasoning_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>automated_reasoning_policies_list_only</code> resource, see <a href="/services/bedrock/automated_reasoning_policies/#permissions"><code>automated_reasoning_policies</code></a>
-
diff --git a/website/docs/services/bedrock/automated_reasoning_policy_versions/index.md b/website/docs/services/bedrock/automated_reasoning_policy_versions/index.md
index fdbb805f9..44d11ee9d 100644
--- a/website/docs/services/bedrock/automated_reasoning_policy_versions/index.md
+++ b/website/docs/services/bedrock/automated_reasoning_policy_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>automated_reasoning_policy_version</c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "policy_arn",
@@ -97,6 +106,28 @@ Creates, updates, deletes or gets an <code>automated_reasoning_policy_version</c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "policy_arn",
+    "type": "string",
+    "description": "Arn of the policy"
+  },
+  {
+    "name": "version",
+    "type": "string",
+    "description": "The version of the policy"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-automatedreasoningpolicyversion.html"><code>AWS::Bedrock::AutomatedReasoningPolicyVersion</code></a>.
 
@@ -106,26 +137,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>automated_reasoning_policy_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PolicyArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>automated_reasoning_policy_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>automated_reasoning_policy_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>automated_reasoning_policy_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +170,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>automated_reasoning_policy_version</code>.
 ```sql
 SELECT
@@ -151,6 +196,20 @@ tags
 FROM awscc.bedrock.automated_reasoning_policy_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<PolicyArn>|<Version>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>automated_reasoning_policy_versions</code> in a region.
+```sql
+SELECT
+region,
+policy_arn,
+version
+FROM awscc.bedrock.automated_reasoning_policy_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -221,6 +280,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/automated_reasoning_policy_versions_list_only/index.md b/website/docs/services/bedrock/automated_reasoning_policy_versions_list_only/index.md
deleted file mode 100644
index db8b703c3..000000000
--- a/website/docs/services/bedrock/automated_reasoning_policy_versions_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: automated_reasoning_policy_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - automated_reasoning_policy_versions_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>automated_reasoning_policy_versions</code> in a region or regions, for all properties use <a href="/services/bedrock/automated_reasoning_policy_versions/"><code>automated_reasoning_policy_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>automated_reasoning_policy_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::AutomatedReasoningPolicyVersion Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.automated_reasoning_policy_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "policy_arn",
-    "type": "string",
-    "description": "Arn of the policy"
-  },
-  {
-    "name": "version",
-    "type": "string",
-    "description": "The version of the policy"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>automated_reasoning_policy_versions</code> in a region.
-```sql
-SELECT
-region,
-policy_arn,
-version
-FROM awscc.bedrock.automated_reasoning_policy_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>automated_reasoning_policy_versions_list_only</code> resource, see <a href="/services/bedrock/automated_reasoning_policy_versions/#permissions"><code>automated_reasoning_policy_versions</code></a>
-
diff --git a/website/docs/services/bedrock/blueprints/index.md b/website/docs/services/bedrock/blueprints/index.md
index 29306e840..bbbf84c6c 100644
--- a/website/docs/services/bedrock/blueprints/index.md
+++ b/website/docs/services/bedrock/blueprints/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>blueprint</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "blueprint_arn",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets a <code>blueprint</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "blueprint_arn",
+    "type": "string",
+    "description": "ARN of a Blueprint"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-blueprint.html"><code>AWS::Bedrock::Blueprint</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>blueprints</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="BlueprintName, Schema, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>blueprints</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>blueprints</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>blueprints_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>blueprints</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>blueprint</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ tags
 FROM awscc.bedrock.blueprints
 WHERE region = 'us-east-1' AND data__Identifier = '<BlueprintArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>blueprints</code> in a region.
+```sql
+SELECT
+region,
+blueprint_arn
+FROM awscc.bedrock.blueprints_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -247,6 +301,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.bedrock.blueprints
+SET data__PatchDocument = string('{{ {
+    "Schema": schema,
+    "KmsKeyId": kms_key_id,
+    "KmsEncryptionContext": kms_encryption_context,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<BlueprintArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/blueprints_list_only/index.md b/website/docs/services/bedrock/blueprints_list_only/index.md
deleted file mode 100644
index 217820997..000000000
--- a/website/docs/services/bedrock/blueprints_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: blueprints_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - blueprints_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>blueprints</code> in a region or regions, for all properties use <a href="/services/bedrock/blueprints/"><code>blueprints</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>blueprints_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::Blueprint Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.blueprints_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "blueprint_arn",
-    "type": "string",
-    "description": "ARN of a Blueprint"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>blueprints</code> in a region.
-```sql
-SELECT
-region,
-blueprint_arn
-FROM awscc.bedrock.blueprints_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>blueprints_list_only</code> resource, see <a href="/services/bedrock/blueprints/#permissions"><code>blueprints</code></a>
-
diff --git a/website/docs/services/bedrock/data_automation_projects/index.md b/website/docs/services/bedrock/data_automation_projects/index.md
index c4d3f58d1..bc7f91203 100644
--- a/website/docs/services/bedrock/data_automation_projects/index.md
+++ b/website/docs/services/bedrock/data_automation_projects/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_automation_project</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "creation_time",
@@ -416,6 +425,23 @@ Creates, updates, deletes or gets a <code>data_automation_project</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "project_arn",
+    "type": "string",
+    "description": "ARN of a DataAutomationProject"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-dataautomationproject.html"><code>AWS::Bedrock::DataAutomationProject</code></a>.
 
@@ -425,31 +451,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_automation_projects</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ProjectName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_automation_projects</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_automation_projects</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_automation_projects_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_automation_projects</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -458,6 +490,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_automation_project</code>.
 ```sql
 SELECT
@@ -478,6 +519,19 @@ tags
 FROM awscc.bedrock.data_automation_projects
 WHERE region = 'us-east-1' AND data__Identifier = '<ProjectArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_automation_projects</code> in a region.
+```sql
+SELECT
+region,
+project_arn
+FROM awscc.bedrock.data_automation_projects_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -637,6 +691,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.bedrock.data_automation_projects
+SET data__PatchDocument = string('{{ {
+    "CustomOutputConfiguration": custom_output_configuration,
+    "OverrideConfiguration": override_configuration,
+    "ProjectDescription": project_description,
+    "StandardOutputConfiguration": standard_output_configuration,
+    "KmsKeyId": kms_key_id,
+    "KmsEncryptionContext": kms_encryption_context,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ProjectArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/data_automation_projects_list_only/index.md b/website/docs/services/bedrock/data_automation_projects_list_only/index.md
deleted file mode 100644
index f1301710d..000000000
--- a/website/docs/services/bedrock/data_automation_projects_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: data_automation_projects_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_automation_projects_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_automation_projects</code> in a region or regions, for all properties use <a href="/services/bedrock/data_automation_projects/"><code>data_automation_projects</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_automation_projects_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::DataAutomationProject Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.data_automation_projects_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "project_arn",
-    "type": "string",
-    "description": "ARN of a DataAutomationProject"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_automation_projects</code> in a region.
-```sql
-SELECT
-region,
-project_arn
-FROM awscc.bedrock.data_automation_projects_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_automation_projects_list_only</code> resource, see <a href="/services/bedrock/data_automation_projects/#permissions"><code>data_automation_projects</code></a>
-
diff --git a/website/docs/services/bedrock/data_sources/index.md b/website/docs/services/bedrock/data_sources/index.md
index e239f471c..661fb8b3d 100644
--- a/website/docs/services/bedrock/data_sources/index.md
+++ b/website/docs/services/bedrock/data_sources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "data_source_configuration",
@@ -511,6 +520,28 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "data_source_id",
+    "type": "string",
+    "description": "Identifier for a resource."
+  },
+  {
+    "name": "knowledge_base_id",
+    "type": "string",
+    "description": "The unique identifier of the knowledge base to which to add the data source."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-datasource.html"><code>AWS::Bedrock::DataSource</code></a>.
 
@@ -520,31 +551,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DataSourceConfiguration, Name, KnowledgeBaseId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_sources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -553,6 +590,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_source</code>.
 ```sql
 SELECT
@@ -572,6 +618,20 @@ failure_reasons
 FROM awscc.bedrock.data_sources
 WHERE region = 'us-east-1' AND data__Identifier = '<KnowledgeBaseId>|<DataSourceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_sources</code> in a region.
+```sql
+SELECT
+region,
+knowledge_base_id,
+data_source_id
+FROM awscc.bedrock.data_sources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -751,6 +811,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.bedrock.data_sources
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Name": name,
+    "ServerSideEncryptionConfiguration": server_side_encryption_configuration,
+    "DataDeletionPolicy": data_deletion_policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<KnowledgeBaseId>|<DataSourceId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/data_sources_list_only/index.md b/website/docs/services/bedrock/data_sources_list_only/index.md
deleted file mode 100644
index 0a25d6d8a..000000000
--- a/website/docs/services/bedrock/data_sources_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: data_sources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_sources_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_sources</code> in a region or regions, for all properties use <a href="/services/bedrock/data_sources/"><code>data_sources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_sources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::DataSource Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.data_sources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "data_source_id",
-    "type": "string",
-    "description": "Identifier for a resource."
-  },
-  {
-    "name": "knowledge_base_id",
-    "type": "string",
-    "description": "The unique identifier of the knowledge base to which to add the data source."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_sources</code> in a region.
-```sql
-SELECT
-region,
-knowledge_base_id,
-data_source_id
-FROM awscc.bedrock.data_sources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_sources_list_only</code> resource, see <a href="/services/bedrock/data_sources/#permissions"><code>data_sources</code></a>
-
diff --git a/website/docs/services/bedrock/flow_aliases/index.md b/website/docs/services/bedrock/flow_aliases/index.md
index f7d37cad6..7128b1534 100644
--- a/website/docs/services/bedrock/flow_aliases/index.md
+++ b/website/docs/services/bedrock/flow_aliases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>flow_alias</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -114,6 +123,28 @@ Creates, updates, deletes or gets a <code>flow_alias</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Arn of the Flow Alias"
+  },
+  {
+    "name": "flow_arn",
+    "type": "string",
+    "description": "Arn representation of the Flow"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flowalias.html"><code>AWS::Bedrock::FlowAlias</code></a>.
 
@@ -123,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>flow_aliases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, FlowArn, RoutingConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>flow_aliases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>flow_aliases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>flow_aliases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>flow_aliases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>flow_alias</code>.
 ```sql
 SELECT
@@ -174,6 +220,20 @@ tags
 FROM awscc.bedrock.flow_aliases
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>|<FlowArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>flow_aliases</code> in a region.
+```sql
+SELECT
+region,
+arn,
+flow_arn
+FROM awscc.bedrock.flow_aliases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -261,6 +321,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.bedrock.flow_aliases
+SET data__PatchDocument = string('{{ {
+    "ConcurrencyConfiguration": concurrency_configuration,
+    "Description": description,
+    "Name": name,
+    "RoutingConfiguration": routing_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>|<FlowArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/flow_aliases_list_only/index.md b/website/docs/services/bedrock/flow_aliases_list_only/index.md
deleted file mode 100644
index 7612ca16f..000000000
--- a/website/docs/services/bedrock/flow_aliases_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: flow_aliases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - flow_aliases_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>flow_aliases</code> in a region or regions, for all properties use <a href="/services/bedrock/flow_aliases/"><code>flow_aliases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>flow_aliases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::FlowAlias Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.flow_aliases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Arn of the Flow Alias"
-  },
-  {
-    "name": "flow_arn",
-    "type": "string",
-    "description": "Arn representation of the Flow"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>flow_aliases</code> in a region.
-```sql
-SELECT
-region,
-arn,
-flow_arn
-FROM awscc.bedrock.flow_aliases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>flow_aliases_list_only</code> resource, see <a href="/services/bedrock/flow_aliases/#permissions"><code>flow_aliases</code></a>
-
diff --git a/website/docs/services/bedrock/flow_versions/index.md b/website/docs/services/bedrock/flow_versions/index.md
index 6b58cf3d0..fef55de52 100644
--- a/website/docs/services/bedrock/flow_versions/index.md
+++ b/website/docs/services/bedrock/flow_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>flow_version</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "flow_arn",
@@ -185,6 +194,28 @@ Creates, updates, deletes or gets a <code>flow_version</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "flow_arn",
+    "type": "string",
+    "description": "Arn representation of the Flow"
+  },
+  {
+    "name": "version",
+    "type": "string",
+    "description": "Numerical Version."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flowversion.html"><code>AWS::Bedrock::FlowVersion</code></a>.
 
@@ -194,31 +225,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>flow_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FlowArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>flow_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>flow_versions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>flow_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>flow_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -227,6 +264,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>flow_version</code>.
 ```sql
 SELECT
@@ -244,6 +290,20 @@ customer_encryption_key_arn
 FROM awscc.bedrock.flow_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<FlowArn>|<Version>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>flow_versions</code> in a region.
+```sql
+SELECT
+region,
+flow_arn,
+version
+FROM awscc.bedrock.flow_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -308,6 +368,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/flow_versions_list_only/index.md b/website/docs/services/bedrock/flow_versions_list_only/index.md
deleted file mode 100644
index 3ec8603db..000000000
--- a/website/docs/services/bedrock/flow_versions_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: flow_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - flow_versions_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>flow_versions</code> in a region or regions, for all properties use <a href="/services/bedrock/flow_versions/"><code>flow_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>flow_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::FlowVersion Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.flow_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "flow_arn",
-    "type": "string",
-    "description": "Arn representation of the Flow"
-  },
-  {
-    "name": "version",
-    "type": "string",
-    "description": "Numerical Version."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>flow_versions</code> in a region.
-```sql
-SELECT
-region,
-flow_arn,
-version
-FROM awscc.bedrock.flow_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>flow_versions_list_only</code> resource, see <a href="/services/bedrock/flow_versions/#permissions"><code>flow_versions</code></a>
-
diff --git a/website/docs/services/bedrock/flows/index.md b/website/docs/services/bedrock/flows/index.md
index 0e968c48f..b52bf73f8 100644
--- a/website/docs/services/bedrock/flows/index.md
+++ b/website/docs/services/bedrock/flows/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>flow</code> resource or lists <code>fl
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -229,6 +238,23 @@ Creates, updates, deletes or gets a <code>flow</code> resource or lists <code>fl
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Arn representation of the Flow"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flow.html"><code>AWS::Bedrock::Flow</code></a>.
 
@@ -238,31 +264,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>flows</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ExecutionRoleArn, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>flows</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>flows</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>flows_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>flows</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -271,6 +303,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>flow</code>.
 ```sql
 SELECT
@@ -295,6 +336,19 @@ test_alias_tags
 FROM awscc.bedrock.flows
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>flows</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.bedrock.flows_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -411,6 +465,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.bedrock.flows
+SET data__PatchDocument = string('{{ {
+    "Definition": definition,
+    "DefinitionString": definition_string,
+    "DefinitionS3Location": definition_s3_location,
+    "DefinitionSubstitutions": definition_substitutions,
+    "Description": description,
+    "ExecutionRoleArn": execution_role_arn,
+    "Name": name,
+    "CustomerEncryptionKeyArn": customer_encryption_key_arn,
+    "Tags": tags,
+    "TestAliasTags": test_alias_tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/flows_list_only/index.md b/website/docs/services/bedrock/flows_list_only/index.md
deleted file mode 100644
index 7348ed8cb..000000000
--- a/website/docs/services/bedrock/flows_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: flows_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - flows_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>flows</code> in a region or regions, for all properties use <a href="/services/bedrock/flows/"><code>flows</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>flows_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::Flow Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.flows_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Arn representation of the Flow"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>flows</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.bedrock.flows_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>flows_list_only</code> resource, see <a href="/services/bedrock/flows/#permissions"><code>flows</code></a>
-
diff --git a/website/docs/services/bedrock/guardrail_versions/index.md b/website/docs/services/bedrock/guardrail_versions/index.md
index d36718795..9281535d3 100644
--- a/website/docs/services/bedrock/guardrail_versions/index.md
+++ b/website/docs/services/bedrock/guardrail_versions/index.md
@@ -173,6 +173,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/guardrails/index.md b/website/docs/services/bedrock/guardrails/index.md
index f13c340ef..c5ae34b15 100644
--- a/website/docs/services/bedrock/guardrails/index.md
+++ b/website/docs/services/bedrock/guardrails/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>guardrail</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "blocked_input_messaging",
@@ -422,6 +431,23 @@ Creates, updates, deletes or gets a <code>guardrail</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "guardrail_arn",
+    "type": "string",
+    "description": "Arn representation for the guardrail"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrail.html"><code>AWS::Bedrock::Guardrail</code></a>.
 
@@ -431,31 +457,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>guardrails</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, BlockedInputMessaging, BlockedOutputsMessaging, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>guardrails</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>guardrails</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>guardrails_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>guardrails</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -464,6 +496,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>guardrail</code>.
 ```sql
 SELECT
@@ -491,6 +532,19 @@ word_policy_config
 FROM awscc.bedrock.guardrails
 WHERE region = 'us-east-1' AND data__Identifier = '<GuardrailArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>guardrails</code> in a region.
+```sql
+SELECT
+region,
+guardrail_arn
+FROM awscc.bedrock.guardrails_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -661,6 +715,30 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.bedrock.guardrails
+SET data__PatchDocument = string('{{ {
+    "BlockedInputMessaging": blocked_input_messaging,
+    "BlockedOutputsMessaging": blocked_outputs_messaging,
+    "ContentPolicyConfig": content_policy_config,
+    "ContextualGroundingPolicyConfig": contextual_grounding_policy_config,
+    "CrossRegionConfig": cross_region_config,
+    "Description": description,
+    "KmsKeyArn": kms_key_arn,
+    "Name": name,
+    "SensitiveInformationPolicyConfig": sensitive_information_policy_config,
+    "Tags": tags,
+    "TopicPolicyConfig": topic_policy_config,
+    "WordPolicyConfig": word_policy_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<GuardrailArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/guardrails_list_only/index.md b/website/docs/services/bedrock/guardrails_list_only/index.md
deleted file mode 100644
index 97da1acc8..000000000
--- a/website/docs/services/bedrock/guardrails_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: guardrails_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - guardrails_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>guardrails</code> in a region or regions, for all properties use <a href="/services/bedrock/guardrails/"><code>guardrails</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>guardrails_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::Guardrail Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.guardrails_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "guardrail_arn",
-    "type": "string",
-    "description": "Arn representation for the guardrail"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>guardrails</code> in a region.
-```sql
-SELECT
-region,
-guardrail_arn
-FROM awscc.bedrock.guardrails_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>guardrails_list_only</code> resource, see <a href="/services/bedrock/guardrails/#permissions"><code>guardrails</code></a>
-
diff --git a/website/docs/services/bedrock/index.md b/website/docs/services/bedrock/index.md
index 71b47fc7c..dbcafc736 100644
--- a/website/docs/services/bedrock/index.md
+++ b/website/docs/services/bedrock/index.md
@@ -20,7 +20,7 @@ The bedrock service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>33</b></span><br />
+<span>total resources:&nbsp;<b>17</b></span><br />
 </div>
 </div>
 
@@ -30,39 +30,23 @@ The bedrock service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/bedrock/agent_aliases/">agent_aliases</a><br />
-<a href="/services/bedrock/agent_aliases_list_only/">agent_aliases_list_only</a><br />
 <a href="/services/bedrock/agents/">agents</a><br />
-<a href="/services/bedrock/agents_list_only/">agents_list_only</a><br />
 <a href="/services/bedrock/application_inference_profiles/">application_inference_profiles</a><br />
-<a href="/services/bedrock/application_inference_profiles_list_only/">application_inference_profiles_list_only</a><br />
 <a href="/services/bedrock/automated_reasoning_policies/">automated_reasoning_policies</a><br />
-<a href="/services/bedrock/automated_reasoning_policies_list_only/">automated_reasoning_policies_list_only</a><br />
 <a href="/services/bedrock/automated_reasoning_policy_versions/">automated_reasoning_policy_versions</a><br />
-<a href="/services/bedrock/automated_reasoning_policy_versions_list_only/">automated_reasoning_policy_versions_list_only</a><br />
 <a href="/services/bedrock/blueprints/">blueprints</a><br />
-<a href="/services/bedrock/blueprints_list_only/">blueprints_list_only</a><br />
 <a href="/services/bedrock/data_automation_projects/">data_automation_projects</a><br />
-<a href="/services/bedrock/data_automation_projects_list_only/">data_automation_projects_list_only</a><br />
 <a href="/services/bedrock/data_sources/">data_sources</a><br />
-<a href="/services/bedrock/data_sources_list_only/">data_sources_list_only</a><br />
 <a href="/services/bedrock/flow_aliases/">flow_aliases</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/bedrock/flow_aliases_list_only/">flow_aliases_list_only</a><br />
 <a href="/services/bedrock/flow_versions/">flow_versions</a><br />
-<a href="/services/bedrock/flow_versions_list_only/">flow_versions_list_only</a><br />
 <a href="/services/bedrock/flows/">flows</a><br />
-<a href="/services/bedrock/flows_list_only/">flows_list_only</a><br />
 <a href="/services/bedrock/guardrail_versions/">guardrail_versions</a><br />
 <a href="/services/bedrock/guardrails/">guardrails</a><br />
-<a href="/services/bedrock/guardrails_list_only/">guardrails_list_only</a><br />
 <a href="/services/bedrock/intelligent_prompt_routers/">intelligent_prompt_routers</a><br />
-<a href="/services/bedrock/intelligent_prompt_routers_list_only/">intelligent_prompt_routers_list_only</a><br />
 <a href="/services/bedrock/knowledge_bases/">knowledge_bases</a><br />
-<a href="/services/bedrock/knowledge_bases_list_only/">knowledge_bases_list_only</a><br />
 <a href="/services/bedrock/prompt_versions/">prompt_versions</a><br />
-<a href="/services/bedrock/prompt_versions_list_only/">prompt_versions_list_only</a><br />
-<a href="/services/bedrock/prompts/">prompts</a><br />
-<a href="/services/bedrock/prompts_list_only/">prompts_list_only</a>
+<a href="/services/bedrock/prompts/">prompts</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/bedrock/intelligent_prompt_routers/index.md b/website/docs/services/bedrock/intelligent_prompt_routers/index.md
index 4c938e46a..952edf1ce 100644
--- a/website/docs/services/bedrock/intelligent_prompt_routers/index.md
+++ b/website/docs/services/bedrock/intelligent_prompt_routers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>intelligent_prompt_router</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "created_at",
@@ -121,6 +130,23 @@ Creates, updates, deletes or gets an <code>intelligent_prompt_router</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "prompt_router_arn",
+    "type": "string",
+    "description": "Arn of the Prompt Router."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-intelligentpromptrouter.html"><code>AWS::Bedrock::IntelligentPromptRouter</code></a>.
 
@@ -130,31 +156,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>intelligent_prompt_routers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FallbackModel, Models, PromptRouterName, RoutingCriteria, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>intelligent_prompt_routers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>intelligent_prompt_routers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>intelligent_prompt_routers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>intelligent_prompt_routers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -163,6 +195,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>intelligent_prompt_router</code>.
 ```sql
 SELECT
@@ -181,6 +222,19 @@ updated_at
 FROM awscc.bedrock.intelligent_prompt_routers
 WHERE region = 'us-east-1' AND data__Identifier = '<PromptRouterArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>intelligent_prompt_routers</code> in a region.
+```sql
+SELECT
+region,
+prompt_router_arn
+FROM awscc.bedrock.intelligent_prompt_routers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -272,6 +326,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.bedrock.intelligent_prompt_routers
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PromptRouterArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/intelligent_prompt_routers_list_only/index.md b/website/docs/services/bedrock/intelligent_prompt_routers_list_only/index.md
deleted file mode 100644
index 65b597df9..000000000
--- a/website/docs/services/bedrock/intelligent_prompt_routers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: intelligent_prompt_routers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - intelligent_prompt_routers_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>intelligent_prompt_routers</code> in a region or regions, for all properties use <a href="/services/bedrock/intelligent_prompt_routers/"><code>intelligent_prompt_routers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>intelligent_prompt_routers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::IntelligentPromptRouter Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.intelligent_prompt_routers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "prompt_router_arn",
-    "type": "string",
-    "description": "Arn of the Prompt Router."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>intelligent_prompt_routers</code> in a region.
-```sql
-SELECT
-region,
-prompt_router_arn
-FROM awscc.bedrock.intelligent_prompt_routers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>intelligent_prompt_routers_list_only</code> resource, see <a href="/services/bedrock/intelligent_prompt_routers/#permissions"><code>intelligent_prompt_routers</code></a>
-
diff --git a/website/docs/services/bedrock/knowledge_bases/index.md b/website/docs/services/bedrock/knowledge_bases/index.md
index e8eab2921..7989aa347 100644
--- a/website/docs/services/bedrock/knowledge_bases/index.md
+++ b/website/docs/services/bedrock/knowledge_bases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>knowledge_base</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -470,6 +479,23 @@ Creates, updates, deletes or gets a <code>knowledge_base</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "knowledge_base_id",
+    "type": "string",
+    "description": "The unique identifier of the knowledge base."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-knowledgebase.html"><code>AWS::Bedrock::KnowledgeBase</code></a>.
 
@@ -479,31 +505,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>knowledge_bases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="KnowledgeBaseConfiguration, Name, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>knowledge_bases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>knowledge_bases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>knowledge_bases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>knowledge_bases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -512,6 +544,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>knowledge_base</code>.
 ```sql
 SELECT
@@ -531,6 +572,19 @@ tags
 FROM awscc.bedrock.knowledge_bases
 WHERE region = 'us-east-1' AND data__Identifier = '<KnowledgeBaseId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>knowledge_bases</code> in a region.
+```sql
+SELECT
+region,
+knowledge_base_id
+FROM awscc.bedrock.knowledge_bases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -717,6 +771,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.bedrock.knowledge_bases
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Name": name,
+    "RoleArn": role_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<KnowledgeBaseId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/knowledge_bases_list_only/index.md b/website/docs/services/bedrock/knowledge_bases_list_only/index.md
deleted file mode 100644
index 743b5635b..000000000
--- a/website/docs/services/bedrock/knowledge_bases_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: knowledge_bases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - knowledge_bases_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>knowledge_bases</code> in a region or regions, for all properties use <a href="/services/bedrock/knowledge_bases/"><code>knowledge_bases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>knowledge_bases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::KnowledgeBase Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.knowledge_bases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "knowledge_base_id",
-    "type": "string",
-    "description": "The unique identifier of the knowledge base."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>knowledge_bases</code> in a region.
-```sql
-SELECT
-region,
-knowledge_base_id
-FROM awscc.bedrock.knowledge_bases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>knowledge_bases_list_only</code> resource, see <a href="/services/bedrock/knowledge_bases/#permissions"><code>knowledge_bases</code></a>
-
diff --git a/website/docs/services/bedrock/prompt_versions/index.md b/website/docs/services/bedrock/prompt_versions/index.md
index 5744e6409..bd4c8148e 100644
--- a/website/docs/services/bedrock/prompt_versions/index.md
+++ b/website/docs/services/bedrock/prompt_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>prompt_version</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "prompt_arn",
@@ -154,6 +163,23 @@ Creates, updates, deletes or gets a <code>prompt_version</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "ARN of a prompt version resource"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-promptversion.html"><code>AWS::Bedrock::PromptVersion</code></a>.
 
@@ -163,26 +189,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>prompt_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PromptArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>prompt_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>prompt_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>prompt_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -191,6 +222,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>prompt_version</code>.
 ```sql
 SELECT
@@ -210,6 +250,19 @@ tags
 FROM awscc.bedrock.prompt_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>prompt_versions</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.bedrock.prompt_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -278,6 +331,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/prompt_versions_list_only/index.md b/website/docs/services/bedrock/prompt_versions_list_only/index.md
deleted file mode 100644
index 4ce9ae2a0..000000000
--- a/website/docs/services/bedrock/prompt_versions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: prompt_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - prompt_versions_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>prompt_versions</code> in a region or regions, for all properties use <a href="/services/bedrock/prompt_versions/"><code>prompt_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>prompt_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::PromptVersion Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.prompt_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "ARN of a prompt version resource"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>prompt_versions</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.bedrock.prompt_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>prompt_versions_list_only</code> resource, see <a href="/services/bedrock/prompt_versions/#permissions"><code>prompt_versions</code></a>
-
diff --git a/website/docs/services/bedrock/prompts/index.md b/website/docs/services/bedrock/prompts/index.md
index 750cde6f1..a395431eb 100644
--- a/website/docs/services/bedrock/prompts/index.md
+++ b/website/docs/services/bedrock/prompts/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>prompt</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -149,6 +158,23 @@ Creates, updates, deletes or gets a <code>prompt</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "ARN of a prompt resource possibly with a version"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-prompt.html"><code>AWS::Bedrock::Prompt</code></a>.
 
@@ -158,31 +184,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>prompts</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>prompts</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>prompts</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>prompts_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>prompts</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -191,6 +223,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>prompt</code>.
 ```sql
 SELECT
@@ -209,6 +250,19 @@ version
 FROM awscc.bedrock.prompts
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>prompts</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.bedrock.prompts_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -299,6 +353,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.bedrock.prompts
+SET data__PatchDocument = string('{{ {
+    "DefaultVariant": default_variant,
+    "Description": description,
+    "Name": name,
+    "Variants": variants,
+    "Tags": tags,
+    "CustomerEncryptionKeyArn": customer_encryption_key_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/bedrock/prompts_list_only/index.md b/website/docs/services/bedrock/prompts_list_only/index.md
deleted file mode 100644
index d10159d9b..000000000
--- a/website/docs/services/bedrock/prompts_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: prompts_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - prompts_list_only
-  - bedrock
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>prompts</code> in a region or regions, for all properties use <a href="/services/bedrock/prompts/"><code>prompts</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>prompts_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Bedrock::Prompt Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.bedrock.prompts_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "ARN of a prompt resource possibly with a version"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>prompts</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.bedrock.prompts_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>prompts_list_only</code> resource, see <a href="/services/bedrock/prompts/#permissions"><code>prompts</code></a>
-
diff --git a/website/docs/services/billing/billing_views/index.md b/website/docs/services/billing/billing_views/index.md
index b9a651e1c..bdcf30814 100644
--- a/website/docs/services/billing/billing_views/index.md
+++ b/website/docs/services/billing/billing_views/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>billing_view</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -138,6 +147,23 @@ Creates, updates, deletes or gets a <code>billing_view</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-billing-billingview.html"><code>AWS::Billing::BillingView</code></a>.
 
@@ -147,31 +173,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>billing_views</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, SourceViews, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>billing_views</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>billing_views</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>billing_views_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>billing_views</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -180,6 +212,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>billing_view</code>.
 ```sql
 SELECT
@@ -197,6 +238,19 @@ updated_at
 FROM awscc.billing.billing_views
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>billing_views</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.billing.billing_views_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -286,6 +340,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.billing.billing_views
+SET data__PatchDocument = string('{{ {
+    "DataFilterExpression": data_filter_expression,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/billing/billing_views_list_only/index.md b/website/docs/services/billing/billing_views_list_only/index.md
deleted file mode 100644
index 758c90c0b..000000000
--- a/website/docs/services/billing/billing_views_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: billing_views_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - billing_views_list_only
-  - billing
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>billing_views</code> in a region or regions, for all properties use <a href="/services/billing/billing_views/"><code>billing_views</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>billing_views_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A billing view is a container of cost & usage metadata.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.billing.billing_views_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>billing_views</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.billing.billing_views_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>billing_views_list_only</code> resource, see <a href="/services/billing/billing_views/#permissions"><code>billing_views</code></a>
-
diff --git a/website/docs/services/billing/index.md b/website/docs/services/billing/index.md
index b29fb58f8..903097a2c 100644
--- a/website/docs/services/billing/index.md
+++ b/website/docs/services/billing/index.md
@@ -20,7 +20,7 @@ The billing service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The billing service documentation.
 <a href="/services/billing/billing_views/">billing_views</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/billing/billing_views_list_only/">billing_views_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/billingconductor/billing_groups/index.md b/website/docs/services/billingconductor/billing_groups/index.md
index b7b78433e..a4c66dccf 100644
--- a/website/docs/services/billingconductor/billing_groups/index.md
+++ b/website/docs/services/billingconductor/billing_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>billing_group</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -131,6 +140,23 @@ Creates, updates, deletes or gets a <code>billing_group</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Billing Group ARN"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-billingconductor-billinggroup.html"><code>AWS::BillingConductor::BillingGroup</code></a>.
 
@@ -140,31 +166,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>billing_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, AccountGrouping, PrimaryAccountId, ComputationPreference, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>billing_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>billing_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>billing_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>billing_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -173,6 +205,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>billing_group</code>.
 ```sql
 SELECT
@@ -192,6 +233,19 @@ tags
 FROM awscc.billingconductor.billing_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>billing_groups</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.billingconductor.billing_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -284,6 +338,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.billingconductor.billing_groups
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "ComputationPreference": computation_preference,
+    "AccountGrouping": account_grouping,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/billingconductor/billing_groups_list_only/index.md b/website/docs/services/billingconductor/billing_groups_list_only/index.md
deleted file mode 100644
index 3ddc7be49..000000000
--- a/website/docs/services/billingconductor/billing_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: billing_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - billing_groups_list_only
-  - billingconductor
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>billing_groups</code> in a region or regions, for all properties use <a href="/services/billingconductor/billing_groups/"><code>billing_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>billing_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A billing group is a set of linked account which belong to the same end customer. It can be seen as a virtual consolidated billing family.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.billingconductor.billing_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Billing Group ARN"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>billing_groups</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.billingconductor.billing_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>billing_groups_list_only</code> resource, see <a href="/services/billingconductor/billing_groups/#permissions"><code>billing_groups</code></a>
-
diff --git a/website/docs/services/billingconductor/custom_line_items/index.md b/website/docs/services/billingconductor/custom_line_items/index.md
index 69587c881..9a1815c58 100644
--- a/website/docs/services/billingconductor/custom_line_items/index.md
+++ b/website/docs/services/billingconductor/custom_line_items/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>custom_line_item</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -187,6 +196,23 @@ Creates, updates, deletes or gets a <code>custom_line_item</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "ARN"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-billingconductor-customlineitem.html"><code>AWS::BillingConductor::CustomLineItem</code></a>.
 
@@ -196,31 +222,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>custom_line_items</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, BillingGroupArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>custom_line_items</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>custom_line_items</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>custom_line_items_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>custom_line_items</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -229,6 +261,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>custom_line_item</code>.
 ```sql
 SELECT
@@ -249,6 +290,19 @@ tags
 FROM awscc.billingconductor.custom_line_items
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>custom_line_items</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.billingconductor.custom_line_items_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -351,6 +405,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.billingconductor.custom_line_items
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/billingconductor/custom_line_items_list_only/index.md b/website/docs/services/billingconductor/custom_line_items_list_only/index.md
deleted file mode 100644
index 55b22fe5f..000000000
--- a/website/docs/services/billingconductor/custom_line_items_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: custom_line_items_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - custom_line_items_list_only
-  - billingconductor
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>custom_line_items</code> in a region or regions, for all properties use <a href="/services/billingconductor/custom_line_items/"><code>custom_line_items</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>custom_line_items_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A custom line item is an one time charge that is applied to a specific billing group's bill.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.billingconductor.custom_line_items_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "ARN"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>custom_line_items</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.billingconductor.custom_line_items_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>custom_line_items_list_only</code> resource, see <a href="/services/billingconductor/custom_line_items/#permissions"><code>custom_line_items</code></a>
-
diff --git a/website/docs/services/billingconductor/index.md b/website/docs/services/billingconductor/index.md
index cc49bc8da..244c17d5d 100644
--- a/website/docs/services/billingconductor/index.md
+++ b/website/docs/services/billingconductor/index.md
@@ -20,7 +20,7 @@ The billingconductor service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The billingconductor service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/billingconductor/billing_groups/">billing_groups</a><br />
-<a href="/services/billingconductor/billing_groups_list_only/">billing_groups_list_only</a><br />
-<a href="/services/billingconductor/custom_line_items/">custom_line_items</a><br />
-<a href="/services/billingconductor/custom_line_items_list_only/">custom_line_items_list_only</a>
+<a href="/services/billingconductor/custom_line_items/">custom_line_items</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/billingconductor/pricing_plans/">pricing_plans</a><br />
-<a href="/services/billingconductor/pricing_plans_list_only/">pricing_plans_list_only</a><br />
-<a href="/services/billingconductor/pricing_rules/">pricing_rules</a><br />
-<a href="/services/billingconductor/pricing_rules_list_only/">pricing_rules_list_only</a>
+<a href="/services/billingconductor/pricing_rules/">pricing_rules</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/billingconductor/pricing_plans/index.md b/website/docs/services/billingconductor/pricing_plans/index.md
index 1f98eef88..263573641 100644
--- a/website/docs/services/billingconductor/pricing_plans/index.md
+++ b/website/docs/services/billingconductor/pricing_plans/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>pricing_plan</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>pricing_plan</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Pricing Plan ARN"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-billingconductor-pricingplan.html"><code>AWS::BillingConductor::PricingPlan</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>pricing_plans</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>pricing_plans</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>pricing_plans</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>pricing_plans_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>pricing_plans</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>pricing_plan</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.billingconductor.pricing_plans
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>pricing_plans</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.billingconductor.pricing_plans_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -224,6 +278,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.billingconductor.pricing_plans
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "PricingRuleArns": pricing_rule_arns,
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/billingconductor/pricing_plans_list_only/index.md b/website/docs/services/billingconductor/pricing_plans_list_only/index.md
deleted file mode 100644
index c955712d1..000000000
--- a/website/docs/services/billingconductor/pricing_plans_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: pricing_plans_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - pricing_plans_list_only
-  - billingconductor
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>pricing_plans</code> in a region or regions, for all properties use <a href="/services/billingconductor/pricing_plans/"><code>pricing_plans</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>pricing_plans_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Pricing Plan enables you to customize your billing details consistent with the usage that accrues in each of your billing groups.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.billingconductor.pricing_plans_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Pricing Plan ARN"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>pricing_plans</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.billingconductor.pricing_plans_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>pricing_plans_list_only</code> resource, see <a href="/services/billingconductor/pricing_plans/#permissions"><code>pricing_plans</code></a>
-
diff --git a/website/docs/services/billingconductor/pricing_rules/index.md b/website/docs/services/billingconductor/pricing_rules/index.md
index d41b4b8a4..8649b0e6d 100644
--- a/website/docs/services/billingconductor/pricing_rules/index.md
+++ b/website/docs/services/billingconductor/pricing_rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>pricing_rule</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -141,6 +150,23 @@ Creates, updates, deletes or gets a <code>pricing_rule</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Pricing rule ARN"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-billingconductor-pricingrule.html"><code>AWS::BillingConductor::PricingRule</code></a>.
 
@@ -150,31 +176,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>pricing_rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Scope, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>pricing_rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>pricing_rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>pricing_rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>pricing_rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -183,6 +215,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>pricing_rule</code>.
 ```sql
 SELECT
@@ -205,6 +246,19 @@ tags
 FROM awscc.billingconductor.pricing_rules
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>pricing_rules</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.billingconductor.pricing_rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -313,6 +367,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.billingconductor.pricing_rules
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "Type": type,
+    "ModifierPercentage": modifier_percentage,
+    "Tiering": tiering,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/billingconductor/pricing_rules_list_only/index.md b/website/docs/services/billingconductor/pricing_rules_list_only/index.md
deleted file mode 100644
index a1fad7c2c..000000000
--- a/website/docs/services/billingconductor/pricing_rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: pricing_rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - pricing_rules_list_only
-  - billingconductor
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>pricing_rules</code> in a region or regions, for all properties use <a href="/services/billingconductor/pricing_rules/"><code>pricing_rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>pricing_rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A markup/discount that is defined for a specific set of services that can later be associated with a pricing plan.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.billingconductor.pricing_rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Pricing rule ARN"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>pricing_rules</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.billingconductor.pricing_rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>pricing_rules_list_only</code> resource, see <a href="/services/billingconductor/pricing_rules/#permissions"><code>pricing_rules</code></a>
-
diff --git a/website/docs/services/budgets/budgets_actions/index.md b/website/docs/services/budgets/budgets_actions/index.md
index 6c2f73d38..d97854f2b 100644
--- a/website/docs/services/budgets/budgets_actions/index.md
+++ b/website/docs/services/budgets/budgets_actions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>budgets_action</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "action_id",
@@ -194,6 +203,28 @@ Creates, updates, deletes or gets a <code>budgets_action</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "action_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "budget_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budgetsaction.html"><code>AWS::Budgets::BudgetsAction</code></a>.
 
@@ -203,31 +234,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>budgets_actions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="BudgetName, NotificationType, ActionType, ActionThreshold, ExecutionRoleArn, Definition, Subscribers, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>budgets_actions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>budgets_actions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>budgets_actions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>budgets_actions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -236,6 +273,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>budgets_action</code>.
 ```sql
 SELECT
@@ -253,6 +299,20 @@ resource_tags
 FROM awscc.budgets.budgets_actions
 WHERE region = 'us-east-1' AND data__Identifier = '<ActionId>|<BudgetName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>budgets_actions</code> in a region.
+```sql
+SELECT
+region,
+action_id,
+budget_name
+FROM awscc.budgets.budgets_actions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -380,6 +440,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.budgets.budgets_actions
+SET data__PatchDocument = string('{{ {
+    "NotificationType": notification_type,
+    "ActionThreshold": action_threshold,
+    "ExecutionRoleArn": execution_role_arn,
+    "ApprovalModel": approval_model,
+    "Subscribers": subscribers,
+    "Definition": definition,
+    "ResourceTags": resource_tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ActionId>|<BudgetName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/budgets/budgets_actions_list_only/index.md b/website/docs/services/budgets/budgets_actions_list_only/index.md
deleted file mode 100644
index 157d7b3c9..000000000
--- a/website/docs/services/budgets/budgets_actions_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: budgets_actions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - budgets_actions_list_only
-  - budgets
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>budgets_actions</code> in a region or regions, for all properties use <a href="/services/budgets/budgets_actions/"><code>budgets_actions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>budgets_actions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An example resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.budgets.budgets_actions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "action_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "budget_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>budgets_actions</code> in a region.
-```sql
-SELECT
-region,
-action_id,
-budget_name
-FROM awscc.budgets.budgets_actions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>budgets_actions_list_only</code> resource, see <a href="/services/budgets/budgets_actions/#permissions"><code>budgets_actions</code></a>
-
diff --git a/website/docs/services/budgets/index.md b/website/docs/services/budgets/index.md
index 56fd988eb..40a36b3b9 100644
--- a/website/docs/services/budgets/index.md
+++ b/website/docs/services/budgets/index.md
@@ -20,7 +20,7 @@ The budgets service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The budgets service documentation.
 <a href="/services/budgets/budgets_actions/">budgets_actions</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/budgets/budgets_actions_list_only/">budgets_actions_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/cassandra/index.md b/website/docs/services/cassandra/index.md
index 299bcc83b..df5953c2b 100644
--- a/website/docs/services/cassandra/index.md
+++ b/website/docs/services/cassandra/index.md
@@ -20,7 +20,7 @@ The cassandra service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The cassandra service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/cassandra/keyspaces/">keyspaces</a><br />
-<a href="/services/cassandra/keyspaces_list_only/">keyspaces_list_only</a><br />
 <a href="/services/cassandra/tables/">tables</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/cassandra/tables_list_only/">tables_list_only</a><br />
-<a href="/services/cassandra/types/">types</a><br />
-<a href="/services/cassandra/types_list_only/">types_list_only</a>
+<a href="/services/cassandra/types/">types</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/cassandra/keyspaces/index.md b/website/docs/services/cassandra/keyspaces/index.md
index 7a1b152b9..878eccc41 100644
--- a/website/docs/services/cassandra/keyspaces/index.md
+++ b/website/docs/services/cassandra/keyspaces/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>keyspace</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "keyspace_name",
@@ -84,6 +93,23 @@ Creates, updates, deletes or gets a <code>keyspace</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "keyspace_name",
+    "type": "string",
+    "description": "Name for Cassandra keyspace"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-keyspace.html"><code>AWS::Cassandra::Keyspace</code></a>.
 
@@ -93,31 +119,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>keyspaces</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>keyspaces</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>keyspaces</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>keyspaces_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>keyspaces</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -126,6 +158,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>keyspace</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ client_side_timestamps_enabled
 FROM awscc.cassandra.keyspaces
 WHERE region = 'us-east-1' AND data__Identifier = '<KeyspaceName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>keyspaces</code> in a region.
+```sql
+SELECT
+region,
+keyspace_name
+FROM awscc.cassandra.keyspaces_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -214,6 +268,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cassandra.keyspaces
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "ReplicationSpecification": replication_specification,
+    "ClientSideTimestampsEnabled": client_side_timestamps_enabled
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<KeyspaceName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cassandra/keyspaces_list_only/index.md b/website/docs/services/cassandra/keyspaces_list_only/index.md
deleted file mode 100644
index c1b4380a1..000000000
--- a/website/docs/services/cassandra/keyspaces_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: keyspaces_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - keyspaces_list_only
-  - cassandra
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>keyspaces</code> in a region or regions, for all properties use <a href="/services/cassandra/keyspaces/"><code>keyspaces</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>keyspaces_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Cassandra::Keyspace</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cassandra.keyspaces_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "keyspace_name",
-    "type": "string",
-    "description": "Name for Cassandra keyspace"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>keyspaces</code> in a region.
-```sql
-SELECT
-region,
-keyspace_name
-FROM awscc.cassandra.keyspaces_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>keyspaces_list_only</code> resource, see <a href="/services/cassandra/keyspaces/#permissions"><code>keyspaces</code></a>
-
diff --git a/website/docs/services/cassandra/tables/index.md b/website/docs/services/cassandra/tables/index.md
index 3ab608b3c..53fa7d124 100644
--- a/website/docs/services/cassandra/tables/index.md
+++ b/website/docs/services/cassandra/tables/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>table</code> resource or lists <code>t
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "keyspace_name",
@@ -276,6 +285,28 @@ Creates, updates, deletes or gets a <code>table</code> resource or lists <code>t
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "keyspace_name",
+    "type": "string",
+    "description": "Name for Cassandra keyspace"
+  },
+  {
+    "name": "table_name",
+    "type": "string",
+    "description": "Name for Cassandra table"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-table.html"><code>AWS::Cassandra::Table</code></a>.
 
@@ -285,31 +316,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="KeyspaceName, PartitionKeyColumns, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>tables_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -318,6 +355,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>table</code>.
 ```sql
 SELECT
@@ -339,6 +385,20 @@ replica_specifications
 FROM awscc.cassandra.tables
 WHERE region = 'us-east-1' AND data__Identifier = '<KeyspaceName>|<TableName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>tables</code> in a region.
+```sql
+SELECT
+region,
+keyspace_name,
+table_name
+FROM awscc.cassandra.tables_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -484,6 +544,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cassandra.tables
+SET data__PatchDocument = string('{{ {
+    "RegularColumns": regular_columns,
+    "BillingMode": billing_mode,
+    "PointInTimeRecoveryEnabled": point_in_time_recovery_enabled,
+    "Tags": tags,
+    "DefaultTimeToLive": default_time_to_live,
+    "EncryptionSpecification": encryption_specification,
+    "AutoScalingSpecifications": auto_scaling_specifications,
+    "CdcSpecification": cdc_specification,
+    "ReplicaSpecifications": replica_specifications
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<KeyspaceName>|<TableName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cassandra/tables_list_only/index.md b/website/docs/services/cassandra/tables_list_only/index.md
deleted file mode 100644
index f5e5cc58d..000000000
--- a/website/docs/services/cassandra/tables_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: tables_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - tables_list_only
-  - cassandra
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>tables</code> in a region or regions, for all properties use <a href="/services/cassandra/tables/"><code>tables</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>tables_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Cassandra::Table</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cassandra.tables_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "keyspace_name",
-    "type": "string",
-    "description": "Name for Cassandra keyspace"
-  },
-  {
-    "name": "table_name",
-    "type": "string",
-    "description": "Name for Cassandra table"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>tables</code> in a region.
-```sql
-SELECT
-region,
-keyspace_name,
-table_name
-FROM awscc.cassandra.tables_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>tables_list_only</code> resource, see <a href="/services/cassandra/tables/#permissions"><code>tables</code></a>
-
diff --git a/website/docs/services/cassandra/types/index.md b/website/docs/services/cassandra/types/index.md
index a7c466a8a..1330e1a2c 100644
--- a/website/docs/services/cassandra/types/index.md
+++ b/website/docs/services/cassandra/types/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>type</code> resource or lists <code>ty
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "keyspace_name",
@@ -92,6 +101,28 @@ Creates, updates, deletes or gets a <code>type</code> resource or lists <code>ty
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "keyspace_name",
+    "type": "string",
+    "description": "Name of the Keyspace which contains the User-Defined Type."
+  },
+  {
+    "name": "type_name",
+    "type": "string",
+    "description": "Name of the User-Defined Type."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-type.html"><code>AWS::Cassandra::Type</code></a>.
 
@@ -101,26 +132,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>types</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="KeyspaceName, TypeName, Fields, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>types</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>types_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>types</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +165,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>type</code>.
 ```sql
 SELECT
@@ -144,6 +189,20 @@ keyspace_arn
 FROM awscc.cassandra.types
 WHERE region = 'us-east-1' AND data__Identifier = '<KeyspaceName>|<TypeName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>types</code> in a region.
+```sql
+SELECT
+region,
+keyspace_name,
+type_name
+FROM awscc.cassandra.types_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -218,6 +277,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cassandra/types_list_only/index.md b/website/docs/services/cassandra/types_list_only/index.md
deleted file mode 100644
index f7c89dea6..000000000
--- a/website/docs/services/cassandra/types_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: types_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - types_list_only
-  - cassandra
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>types</code> in a region or regions, for all properties use <a href="/services/cassandra/types/"><code>types</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>types_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Cassandra::Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cassandra.types_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "keyspace_name",
-    "type": "string",
-    "description": "Name of the Keyspace which contains the User-Defined Type."
-  },
-  {
-    "name": "type_name",
-    "type": "string",
-    "description": "Name of the User-Defined Type."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>types</code> in a region.
-```sql
-SELECT
-region,
-keyspace_name,
-type_name
-FROM awscc.cassandra.types_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>types_list_only</code> resource, see <a href="/services/cassandra/types/#permissions"><code>types</code></a>
-
diff --git a/website/docs/services/ce/anomaly_monitors/index.md b/website/docs/services/ce/anomaly_monitors/index.md
index 4d0f326f9..7900726b1 100644
--- a/website/docs/services/ce/anomaly_monitors/index.md
+++ b/website/docs/services/ce/anomaly_monitors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>anomaly_monitor</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "monitor_arn",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets an <code>anomaly_monitor</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "monitor_arn",
+    "type": "string",
+    "description": "Subscription ARN"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalymonitor.html"><code>AWS::CE::AnomalyMonitor</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>anomaly_monitors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="MonitorName, MonitorType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>anomaly_monitors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>anomaly_monitors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>anomaly_monitors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>anomaly_monitors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>anomaly_monitor</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ resource_tags
 FROM awscc.ce.anomaly_monitors
 WHERE region = 'us-east-1' AND data__Identifier = '<MonitorArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>anomaly_monitors</code> in a region.
+```sql
+SELECT
+region,
+monitor_arn
+FROM awscc.ce.anomaly_monitors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -241,6 +295,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ce.anomaly_monitors
+SET data__PatchDocument = string('{{ {
+    "MonitorName": monitor_name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<MonitorArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ce/anomaly_monitors_list_only/index.md b/website/docs/services/ce/anomaly_monitors_list_only/index.md
deleted file mode 100644
index cc4bb94aa..000000000
--- a/website/docs/services/ce/anomaly_monitors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: anomaly_monitors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - anomaly_monitors_list_only
-  - ce
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>anomaly_monitors</code> in a region or regions, for all properties use <a href="/services/ce/anomaly_monitors/"><code>anomaly_monitors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>anomaly_monitors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS Cost Anomaly Detection leverages advanced Machine Learning technologies to identify anomalous spend and root causes, so you can quickly take action. You can use Cost Anomaly Detection by creating monitor.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ce.anomaly_monitors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "monitor_arn",
-    "type": "string",
-    "description": "Subscription ARN"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>anomaly_monitors</code> in a region.
-```sql
-SELECT
-region,
-monitor_arn
-FROM awscc.ce.anomaly_monitors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>anomaly_monitors_list_only</code> resource, see <a href="/services/ce/anomaly_monitors/#permissions"><code>anomaly_monitors</code></a>
-
diff --git a/website/docs/services/ce/anomaly_subscriptions/index.md b/website/docs/services/ce/anomaly_subscriptions/index.md
index 8eba109d2..4dcdd68c4 100644
--- a/website/docs/services/ce/anomaly_subscriptions/index.md
+++ b/website/docs/services/ce/anomaly_subscriptions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>anomaly_subscription</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "subscription_arn",
@@ -114,6 +123,23 @@ Creates, updates, deletes or gets an <code>anomaly_subscription</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "subscription_arn",
+    "type": "string",
+    "description": "Subscription ARN"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalysubscription.html"><code>AWS::CE::AnomalySubscription</code></a>.
 
@@ -123,31 +149,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>anomaly_subscriptions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="MonitorArnList, Subscribers, Frequency, SubscriptionName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>anomaly_subscriptions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>anomaly_subscriptions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>anomaly_subscriptions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>anomaly_subscriptions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +188,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>anomaly_subscription</code>.
 ```sql
 SELECT
@@ -172,6 +213,19 @@ resource_tags
 FROM awscc.ce.anomaly_subscriptions
 WHERE region = 'us-east-1' AND data__Identifier = '<SubscriptionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>anomaly_subscriptions</code> in a region.
+```sql
+SELECT
+region,
+subscription_arn
+FROM awscc.ce.anomaly_subscriptions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -268,6 +322,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ce.anomaly_subscriptions
+SET data__PatchDocument = string('{{ {
+    "SubscriptionName": subscription_name,
+    "MonitorArnList": monitor_arn_list,
+    "Threshold": threshold,
+    "ThresholdExpression": threshold_expression,
+    "Frequency": frequency
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SubscriptionArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ce/anomaly_subscriptions_list_only/index.md b/website/docs/services/ce/anomaly_subscriptions_list_only/index.md
deleted file mode 100644
index d6d84b2ec..000000000
--- a/website/docs/services/ce/anomaly_subscriptions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: anomaly_subscriptions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - anomaly_subscriptions_list_only
-  - ce
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>anomaly_subscriptions</code> in a region or regions, for all properties use <a href="/services/ce/anomaly_subscriptions/"><code>anomaly_subscriptions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>anomaly_subscriptions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS Cost Anomaly Detection leverages advanced Machine Learning technologies to identify anomalous spend and root causes, so you can quickly take action. Create subscription to be notified</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ce.anomaly_subscriptions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "subscription_arn",
-    "type": "string",
-    "description": "Subscription ARN"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>anomaly_subscriptions</code> in a region.
-```sql
-SELECT
-region,
-subscription_arn
-FROM awscc.ce.anomaly_subscriptions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>anomaly_subscriptions_list_only</code> resource, see <a href="/services/ce/anomaly_subscriptions/#permissions"><code>anomaly_subscriptions</code></a>
-
diff --git a/website/docs/services/ce/cost_categories/index.md b/website/docs/services/ce/cost_categories/index.md
index 514375d72..3f90b6e7b 100644
--- a/website/docs/services/ce/cost_categories/index.md
+++ b/website/docs/services/ce/cost_categories/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cost_category</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>cost_category</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Cost category ARN"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-costcategory.html"><code>AWS::CE::CostCategory</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cost_categories</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, RuleVersion, Rules, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cost_categories</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cost_categories</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cost_categories_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cost_categories</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cost_category</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.ce.cost_categories
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cost_categories</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ce.cost_categories_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -235,6 +289,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ce.cost_categories
+SET data__PatchDocument = string('{{ {
+    "RuleVersion": rule_version,
+    "Rules": rules,
+    "SplitChargeRules": split_charge_rules,
+    "DefaultValue": default_value,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ce/cost_categories_list_only/index.md b/website/docs/services/ce/cost_categories_list_only/index.md
deleted file mode 100644
index 08f7723c9..000000000
--- a/website/docs/services/ce/cost_categories_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: cost_categories_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cost_categories_list_only
-  - ce
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cost_categories</code> in a region or regions, for all properties use <a href="/services/ce/cost_categories/"><code>cost_categories</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cost_categories_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::CE::CostCategory. Cost Category enables you to map your cost and usage into meaningful categories. You can use Cost Category to organize your costs using a rule-based engine.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ce.cost_categories_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Cost category ARN"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cost_categories</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ce.cost_categories_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cost_categories_list_only</code> resource, see <a href="/services/ce/cost_categories/#permissions"><code>cost_categories</code></a>
-
diff --git a/website/docs/services/ce/index.md b/website/docs/services/ce/index.md
index e4bcd5c4a..14a14e250 100644
--- a/website/docs/services/ce/index.md
+++ b/website/docs/services/ce/index.md
@@ -20,7 +20,7 @@ The ce service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The ce service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/ce/anomaly_monitors/">anomaly_monitors</a><br />
-<a href="/services/ce/anomaly_monitors_list_only/">anomaly_monitors_list_only</a><br />
 <a href="/services/ce/anomaly_subscriptions/">anomaly_subscriptions</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/ce/anomaly_subscriptions_list_only/">anomaly_subscriptions_list_only</a><br />
-<a href="/services/ce/cost_categories/">cost_categories</a><br />
-<a href="/services/ce/cost_categories_list_only/">cost_categories_list_only</a>
+<a href="/services/ce/cost_categories/">cost_categories</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/certificatemanager/accounts/index.md b/website/docs/services/certificatemanager/accounts/index.md
index 4295c8238..5fd120aad 100644
--- a/website/docs/services/certificatemanager/accounts/index.md
+++ b/website/docs/services/certificatemanager/accounts/index.md
@@ -164,6 +164,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.certificatemanager.accounts
+SET data__PatchDocument = string('{{ {
+    "ExpiryEventsConfiguration": expiry_events_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/chatbot/custom_actions/index.md b/website/docs/services/chatbot/custom_actions/index.md
index ac1da594f..4d89f88d6 100644
--- a/website/docs/services/chatbot/custom_actions/index.md
+++ b/website/docs/services/chatbot/custom_actions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>custom_action</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "action_name",
@@ -128,6 +137,23 @@ Creates, updates, deletes or gets a <code>custom_action</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "custom_action_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-customaction.html"><code>AWS::Chatbot::CustomAction</code></a>.
 
@@ -137,31 +163,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>custom_actions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ActionName, Definition, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>custom_actions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>custom_actions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>custom_actions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>custom_actions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -170,6 +202,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>custom_action</code>.
 ```sql
 SELECT
@@ -183,6 +224,19 @@ tags
 FROM awscc.chatbot.custom_actions
 WHERE region = 'us-east-1' AND data__Identifier = '<CustomActionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>custom_actions</code> in a region.
+```sql
+SELECT
+region,
+custom_action_arn
+FROM awscc.chatbot.custom_actions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -271,6 +325,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.chatbot.custom_actions
+SET data__PatchDocument = string('{{ {
+    "AliasName": alias_name,
+    "Attachments": attachments,
+    "Definition": definition,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CustomActionArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/chatbot/custom_actions_list_only/index.md b/website/docs/services/chatbot/custom_actions_list_only/index.md
deleted file mode 100644
index bb19c418f..000000000
--- a/website/docs/services/chatbot/custom_actions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: custom_actions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - custom_actions_list_only
-  - chatbot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>custom_actions</code> in a region or regions, for all properties use <a href="/services/chatbot/custom_actions/"><code>custom_actions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>custom_actions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Chatbot::CustomAction Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.chatbot.custom_actions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "custom_action_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>custom_actions</code> in a region.
-```sql
-SELECT
-region,
-custom_action_arn
-FROM awscc.chatbot.custom_actions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>custom_actions_list_only</code> resource, see <a href="/services/chatbot/custom_actions/#permissions"><code>custom_actions</code></a>
-
diff --git a/website/docs/services/chatbot/index.md b/website/docs/services/chatbot/index.md
index b32b7ac1f..2f4c0a4dd 100644
--- a/website/docs/services/chatbot/index.md
+++ b/website/docs/services/chatbot/index.md
@@ -20,7 +20,7 @@ The chatbot service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The chatbot service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/chatbot/custom_actions/">custom_actions</a><br />
-<a href="/services/chatbot/custom_actions_list_only/">custom_actions_list_only</a><br />
 <a href="/services/chatbot/microsoft_teams_channel_configurations/">microsoft_teams_channel_configurations</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/chatbot/microsoft_teams_channel_configurations_list_only/">microsoft_teams_channel_configurations_list_only</a><br />
-<a href="/services/chatbot/slack_channel_configurations/">slack_channel_configurations</a><br />
-<a href="/services/chatbot/slack_channel_configurations_list_only/">slack_channel_configurations_list_only</a>
+<a href="/services/chatbot/slack_channel_configurations/">slack_channel_configurations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/chatbot/microsoft_teams_channel_configurations/index.md b/website/docs/services/chatbot/microsoft_teams_channel_configurations/index.md
index 77f80ef5e..f6147e89c 100644
--- a/website/docs/services/chatbot/microsoft_teams_channel_configurations/index.md
+++ b/website/docs/services/chatbot/microsoft_teams_channel_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>microsoft_teams_channel_configuration<
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "team_id",
@@ -117,6 +126,23 @@ Creates, updates, deletes or gets a <code>microsoft_teams_channel_configuration<
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Amazon Resource Name (ARN) of the configuration"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-microsoftteamschannelconfiguration.html"><code>AWS::Chatbot::MicrosoftTeamsChannelConfiguration</code></a>.
 
@@ -126,31 +152,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>microsoft_teams_channel_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TeamId, TeamsChannelId, TeamsTenantId, ConfigurationName, IamRoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>microsoft_teams_channel_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>microsoft_teams_channel_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>microsoft_teams_channel_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>microsoft_teams_channel_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -159,6 +191,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>microsoft_teams_channel_configuration</code>.
 ```sql
 SELECT
@@ -179,6 +220,19 @@ customization_resource_arns
 FROM awscc.chatbot.microsoft_teams_channel_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>microsoft_teams_channel_configurations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.chatbot.microsoft_teams_channel_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -296,6 +350,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.chatbot.microsoft_teams_channel_configurations
+SET data__PatchDocument = string('{{ {
+    "TeamsChannelId": teams_channel_id,
+    "TeamsChannelName": teams_channel_name,
+    "IamRoleArn": iam_role_arn,
+    "SnsTopicArns": sns_topic_arns,
+    "LoggingLevel": logging_level,
+    "GuardrailPolicies": guardrail_policies,
+    "UserRoleRequired": user_role_required,
+    "Tags": tags,
+    "CustomizationResourceArns": customization_resource_arns
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/chatbot/microsoft_teams_channel_configurations_list_only/index.md b/website/docs/services/chatbot/microsoft_teams_channel_configurations_list_only/index.md
deleted file mode 100644
index f23a60b70..000000000
--- a/website/docs/services/chatbot/microsoft_teams_channel_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: microsoft_teams_channel_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - microsoft_teams_channel_configurations_list_only
-  - chatbot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>microsoft_teams_channel_configurations</code> in a region or regions, for all properties use <a href="/services/chatbot/microsoft_teams_channel_configurations/"><code>microsoft_teams_channel_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>microsoft_teams_channel_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Chatbot::MicrosoftTeamsChannelConfiguration.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.chatbot.microsoft_teams_channel_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Amazon Resource Name (ARN) of the configuration"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>microsoft_teams_channel_configurations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.chatbot.microsoft_teams_channel_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>microsoft_teams_channel_configurations_list_only</code> resource, see <a href="/services/chatbot/microsoft_teams_channel_configurations/#permissions"><code>microsoft_teams_channel_configurations</code></a>
-
diff --git a/website/docs/services/chatbot/slack_channel_configurations/index.md b/website/docs/services/chatbot/slack_channel_configurations/index.md
index c364f571a..df3154159 100644
--- a/website/docs/services/chatbot/slack_channel_configurations/index.md
+++ b/website/docs/services/chatbot/slack_channel_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>slack_channel_configuration</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "slack_workspace_id",
@@ -107,6 +116,23 @@ Creates, updates, deletes or gets a <code>slack_channel_configuration</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Amazon Resource Name (ARN) of the configuration"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-slackchannelconfiguration.html"><code>AWS::Chatbot::SlackChannelConfiguration</code></a>.
 
@@ -116,31 +142,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>slack_channel_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SlackWorkspaceId, SlackChannelId, ConfigurationName, IamRoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>slack_channel_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>slack_channel_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>slack_channel_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>slack_channel_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -149,6 +181,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>slack_channel_configuration</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ customization_resource_arns
 FROM awscc.chatbot.slack_channel_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>slack_channel_configurations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.chatbot.slack_channel_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -274,6 +328,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.chatbot.slack_channel_configurations
+SET data__PatchDocument = string('{{ {
+    "SlackChannelId": slack_channel_id,
+    "IamRoleArn": iam_role_arn,
+    "SnsTopicArns": sns_topic_arns,
+    "LoggingLevel": logging_level,
+    "GuardrailPolicies": guardrail_policies,
+    "Tags": tags,
+    "UserRoleRequired": user_role_required,
+    "CustomizationResourceArns": customization_resource_arns
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/chatbot/slack_channel_configurations_list_only/index.md b/website/docs/services/chatbot/slack_channel_configurations_list_only/index.md
deleted file mode 100644
index 9c7572f23..000000000
--- a/website/docs/services/chatbot/slack_channel_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: slack_channel_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - slack_channel_configurations_list_only
-  - chatbot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>slack_channel_configurations</code> in a region or regions, for all properties use <a href="/services/chatbot/slack_channel_configurations/"><code>slack_channel_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>slack_channel_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Chatbot::SlackChannelConfiguration.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.chatbot.slack_channel_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Amazon Resource Name (ARN) of the configuration"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>slack_channel_configurations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.chatbot.slack_channel_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>slack_channel_configurations_list_only</code> resource, see <a href="/services/chatbot/slack_channel_configurations/#permissions"><code>slack_channel_configurations</code></a>
-
diff --git a/website/docs/services/cleanrooms/analysis_templates/index.md b/website/docs/services/cleanrooms/analysis_templates/index.md
index ce5cc3def..0d23b6ea1 100644
--- a/website/docs/services/cleanrooms/analysis_templates/index.md
+++ b/website/docs/services/cleanrooms/analysis_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>analysis_template</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -146,6 +155,28 @@ Creates, updates, deletes or gets an <code>analysis_template</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "analysis_template_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "membership_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-analysistemplate.html"><code>AWS::CleanRooms::AnalysisTemplate</code></a>.
 
@@ -155,31 +186,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>analysis_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Source, Format, Name, MembershipIdentifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>analysis_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>analysis_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>analysis_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>analysis_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -188,6 +225,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>analysis_template</code>.
 ```sql
 SELECT
@@ -209,6 +255,20 @@ format
 FROM awscc.cleanrooms.analysis_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<AnalysisTemplateIdentifier>|<MembershipIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>analysis_templates</code> in a region.
+```sql
+SELECT
+region,
+analysis_template_identifier,
+membership_identifier
+FROM awscc.cleanrooms.analysis_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -314,6 +374,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cleanrooms.analysis_templates
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Description": description,
+    "SourceMetadata": source_metadata
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AnalysisTemplateIdentifier>|<MembershipIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cleanrooms/analysis_templates_list_only/index.md b/website/docs/services/cleanrooms/analysis_templates_list_only/index.md
deleted file mode 100644
index f93c4d084..000000000
--- a/website/docs/services/cleanrooms/analysis_templates_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: analysis_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - analysis_templates_list_only
-  - cleanrooms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>analysis_templates</code> in a region or regions, for all properties use <a href="/services/cleanrooms/analysis_templates/"><code>analysis_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>analysis_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a stored analysis within a collaboration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cleanrooms.analysis_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "analysis_template_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "membership_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>analysis_templates</code> in a region.
-```sql
-SELECT
-region,
-analysis_template_identifier,
-membership_identifier
-FROM awscc.cleanrooms.analysis_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>analysis_templates_list_only</code> resource, see <a href="/services/cleanrooms/analysis_templates/#permissions"><code>analysis_templates</code></a>
-
diff --git a/website/docs/services/cleanrooms/collaborations/index.md b/website/docs/services/cleanrooms/collaborations/index.md
index a91575a28..6e6474104 100644
--- a/website/docs/services/cleanrooms/collaborations/index.md
+++ b/website/docs/services/cleanrooms/collaborations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>collaboration</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -263,6 +272,23 @@ Creates, updates, deletes or gets a <code>collaboration</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "collaboration_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-collaboration.html"><code>AWS::CleanRooms::Collaboration</code></a>.
 
@@ -272,31 +298,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>collaborations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CreatorDisplayName, Name, Description, QueryLogStatus, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>collaborations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>collaborations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>collaborations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>collaborations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -305,6 +337,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>collaboration</code>.
 ```sql
 SELECT
@@ -326,6 +367,19 @@ creator_payment_configuration
 FROM awscc.cleanrooms.collaborations
 WHERE region = 'us-east-1' AND data__Identifier = '<CollaborationIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>collaborations</code> in a region.
+```sql
+SELECT
+region,
+collaboration_identifier
+FROM awscc.cleanrooms.collaborations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -459,6 +513,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cleanrooms.collaborations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Description": description,
+    "Name": name,
+    "AnalyticsEngine": analytics_engine
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CollaborationIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cleanrooms/collaborations_list_only/index.md b/website/docs/services/cleanrooms/collaborations_list_only/index.md
deleted file mode 100644
index 51b2c7645..000000000
--- a/website/docs/services/cleanrooms/collaborations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: collaborations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - collaborations_list_only
-  - cleanrooms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>collaborations</code> in a region or regions, for all properties use <a href="/services/cleanrooms/collaborations/"><code>collaborations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>collaborations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a collaboration between AWS accounts that allows for secure data collaboration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cleanrooms.collaborations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "collaboration_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>collaborations</code> in a region.
-```sql
-SELECT
-region,
-collaboration_identifier
-FROM awscc.cleanrooms.collaborations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>collaborations_list_only</code> resource, see <a href="/services/cleanrooms/collaborations/#permissions"><code>collaborations</code></a>
-
diff --git a/website/docs/services/cleanrooms/configured_table_associations/index.md b/website/docs/services/cleanrooms/configured_table_associations/index.md
index 5a1e3a324..4bcea5def 100644
--- a/website/docs/services/cleanrooms/configured_table_associations/index.md
+++ b/website/docs/services/cleanrooms/configured_table_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>configured_table_association</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -116,6 +125,28 @@ Creates, updates, deletes or gets a <code>configured_table_association</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "configured_table_association_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "membership_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-configuredtableassociation.html"><code>AWS::CleanRooms::ConfiguredTableAssociation</code></a>.
 
@@ -125,31 +156,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>configured_table_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConfiguredTableIdentifier, Name, RoleArn, MembershipIdentifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>configured_table_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>configured_table_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>configured_table_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>configured_table_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -158,6 +195,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>configured_table_association</code>.
 ```sql
 SELECT
@@ -174,6 +220,20 @@ configured_table_association_analysis_rules
 FROM awscc.cleanrooms.configured_table_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<ConfiguredTableAssociationIdentifier>|<MembershipIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>configured_table_associations</code> in a region.
+```sql
+SELECT
+region,
+configured_table_association_identifier,
+membership_identifier
+FROM awscc.cleanrooms.configured_table_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -269,6 +329,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cleanrooms.configured_table_associations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Description": description,
+    "RoleArn": role_arn,
+    "ConfiguredTableAssociationAnalysisRules": configured_table_association_analysis_rules
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConfiguredTableAssociationIdentifier>|<MembershipIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cleanrooms/configured_table_associations_list_only/index.md b/website/docs/services/cleanrooms/configured_table_associations_list_only/index.md
deleted file mode 100644
index 0fb3b4f85..000000000
--- a/website/docs/services/cleanrooms/configured_table_associations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: configured_table_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - configured_table_associations_list_only
-  - cleanrooms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>configured_table_associations</code> in a region or regions, for all properties use <a href="/services/cleanrooms/configured_table_associations/"><code>configured_table_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>configured_table_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a table that can be queried within a collaboration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cleanrooms.configured_table_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "configured_table_association_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "membership_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>configured_table_associations</code> in a region.
-```sql
-SELECT
-region,
-configured_table_association_identifier,
-membership_identifier
-FROM awscc.cleanrooms.configured_table_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>configured_table_associations_list_only</code> resource, see <a href="/services/cleanrooms/configured_table_associations/#permissions"><code>configured_table_associations</code></a>
-
diff --git a/website/docs/services/cleanrooms/configured_tables/index.md b/website/docs/services/cleanrooms/configured_tables/index.md
index f42f79292..d2ef7d3a6 100644
--- a/website/docs/services/cleanrooms/configured_tables/index.md
+++ b/website/docs/services/cleanrooms/configured_tables/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>configured_table</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -121,6 +130,23 @@ Creates, updates, deletes or gets a <code>configured_table</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "configured_table_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-configuredtable.html"><code>AWS::CleanRooms::ConfiguredTable</code></a>.
 
@@ -130,31 +156,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>configured_tables</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AllowedColumns, AnalysisMethod, Name, TableReference, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>configured_tables</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>configured_tables</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>configured_tables_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>configured_tables</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -163,6 +195,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>configured_table</code>.
 ```sql
 SELECT
@@ -180,6 +221,19 @@ table_reference
 FROM awscc.cleanrooms.configured_tables
 WHERE region = 'us-east-1' AND data__Identifier = '<ConfiguredTableIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>configured_tables</code> in a region.
+```sql
+SELECT
+region,
+configured_table_identifier
+FROM awscc.cleanrooms.configured_tables_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -281,6 +335,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cleanrooms.configured_tables
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "AllowedColumns": allowed_columns,
+    "AnalysisMethod": analysis_method,
+    "SelectedAnalysisMethods": selected_analysis_methods,
+    "Description": description,
+    "Name": name,
+    "AnalysisRules": analysis_rules,
+    "TableReference": table_reference
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConfiguredTableIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cleanrooms/configured_tables_list_only/index.md b/website/docs/services/cleanrooms/configured_tables_list_only/index.md
deleted file mode 100644
index 9b8a5180c..000000000
--- a/website/docs/services/cleanrooms/configured_tables_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: configured_tables_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - configured_tables_list_only
-  - cleanrooms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>configured_tables</code> in a region or regions, for all properties use <a href="/services/cleanrooms/configured_tables/"><code>configured_tables</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>configured_tables_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a table that can be associated with collaborations</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cleanrooms.configured_tables_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "configured_table_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>configured_tables</code> in a region.
-```sql
-SELECT
-region,
-configured_table_identifier
-FROM awscc.cleanrooms.configured_tables_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>configured_tables_list_only</code> resource, see <a href="/services/cleanrooms/configured_tables/#permissions"><code>configured_tables</code></a>
-
diff --git a/website/docs/services/cleanrooms/id_mapping_tables/index.md b/website/docs/services/cleanrooms/id_mapping_tables/index.md
index 8cda2ba24..4870ab0a9 100644
--- a/website/docs/services/cleanrooms/id_mapping_tables/index.md
+++ b/website/docs/services/cleanrooms/id_mapping_tables/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>id_mapping_table</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id_mapping_table_identifier",
@@ -133,6 +142,23 @@ Creates, updates, deletes or gets an <code>id_mapping_table</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id_mapping_table_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idmappingtable.html"><code>AWS::CleanRooms::IdMappingTable</code></a>.
 
@@ -142,31 +168,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>id_mapping_tables</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="MembershipIdentifier, Name, InputReferenceConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>id_mapping_tables</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>id_mapping_tables</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>id_mapping_tables_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>id_mapping_tables</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -175,6 +207,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>id_mapping_table</code>.
 ```sql
 SELECT
@@ -194,6 +235,20 @@ tags
 FROM awscc.cleanrooms.id_mapping_tables
 WHERE region = 'us-east-1' AND data__Identifier = '<IdMappingTableIdentifier>|<MembershipIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>id_mapping_tables</code> in a region.
+```sql
+SELECT
+region,
+id_mapping_table_identifier,
+membership_identifier
+FROM awscc.cleanrooms.id_mapping_tables_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -282,6 +337,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cleanrooms.id_mapping_tables
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "KmsKeyArn": kms_key_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IdMappingTableIdentifier>|<MembershipIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cleanrooms/id_mapping_tables_list_only/index.md b/website/docs/services/cleanrooms/id_mapping_tables_list_only/index.md
deleted file mode 100644
index 89bfdbc21..000000000
--- a/website/docs/services/cleanrooms/id_mapping_tables_list_only/index.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-title: id_mapping_tables_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - id_mapping_tables_list_only
-  - cleanrooms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>id_mapping_tables</code> in a region or regions, for all properties use <a href="/services/cleanrooms/id_mapping_tables/"><code>id_mapping_tables</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>id_mapping_tables_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents an association between an ID mapping workflow and a collaboration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cleanrooms.id_mapping_tables_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id_mapping_table_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>id_mapping_tables</code> in a region.
-```sql
-SELECT
-region,
-id_mapping_table_identifier,
-membership_identifier
-FROM awscc.cleanrooms.id_mapping_tables_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>id_mapping_tables_list_only</code> resource, see <a href="/services/cleanrooms/id_mapping_tables/#permissions"><code>id_mapping_tables</code></a>
-
diff --git a/website/docs/services/cleanrooms/id_namespace_associations/index.md b/website/docs/services/cleanrooms/id_namespace_associations/index.md
index 6c2e6e1d8..ee4e43178 100644
--- a/website/docs/services/cleanrooms/id_namespace_associations/index.md
+++ b/website/docs/services/cleanrooms/id_namespace_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>id_namespace_association</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id_namespace_association_identifier",
@@ -133,6 +142,28 @@ Creates, updates, deletes or gets an <code>id_namespace_association</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id_namespace_association_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idnamespaceassociation.html"><code>AWS::CleanRooms::IdNamespaceAssociation</code></a>.
 
@@ -142,31 +173,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>id_namespace_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="MembershipIdentifier, InputReferenceConfig, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>id_namespace_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>id_namespace_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>id_namespace_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>id_namespace_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -175,6 +212,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>id_namespace_association</code>.
 ```sql
 SELECT
@@ -194,6 +240,20 @@ input_reference_properties
 FROM awscc.cleanrooms.id_namespace_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<IdNamespaceAssociationIdentifier>|<MembershipIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>id_namespace_associations</code> in a region.
+```sql
+SELECT
+region,
+id_namespace_association_identifier,
+membership_identifier
+FROM awscc.cleanrooms.id_namespace_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -283,6 +343,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cleanrooms.id_namespace_associations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Name": name,
+    "Description": description,
+    "IdMappingConfig": id_mapping_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IdNamespaceAssociationIdentifier>|<MembershipIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cleanrooms/id_namespace_associations_list_only/index.md b/website/docs/services/cleanrooms/id_namespace_associations_list_only/index.md
deleted file mode 100644
index 919f71672..000000000
--- a/website/docs/services/cleanrooms/id_namespace_associations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: id_namespace_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - id_namespace_associations_list_only
-  - cleanrooms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>id_namespace_associations</code> in a region or regions, for all properties use <a href="/services/cleanrooms/id_namespace_associations/"><code>id_namespace_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>id_namespace_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents an association between an ID namespace and a collaboration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cleanrooms.id_namespace_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id_namespace_association_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>id_namespace_associations</code> in a region.
-```sql
-SELECT
-region,
-id_namespace_association_identifier,
-membership_identifier
-FROM awscc.cleanrooms.id_namespace_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>id_namespace_associations_list_only</code> resource, see <a href="/services/cleanrooms/id_namespace_associations/#permissions"><code>id_namespace_associations</code></a>
-
diff --git a/website/docs/services/cleanrooms/index.md b/website/docs/services/cleanrooms/index.md
index 8dceac580..291a34fc8 100644
--- a/website/docs/services/cleanrooms/index.md
+++ b/website/docs/services/cleanrooms/index.md
@@ -20,7 +20,7 @@ The cleanrooms service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>16</b></span><br />
+<span>total resources:&nbsp;<b>8</b></span><br />
 </div>
 </div>
 
@@ -30,22 +30,14 @@ The cleanrooms service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/cleanrooms/analysis_templates/">analysis_templates</a><br />
-<a href="/services/cleanrooms/analysis_templates_list_only/">analysis_templates_list_only</a><br />
 <a href="/services/cleanrooms/collaborations/">collaborations</a><br />
-<a href="/services/cleanrooms/collaborations_list_only/">collaborations_list_only</a><br />
 <a href="/services/cleanrooms/configured_table_associations/">configured_table_associations</a><br />
-<a href="/services/cleanrooms/configured_table_associations_list_only/">configured_table_associations_list_only</a><br />
-<a href="/services/cleanrooms/configured_tables/">configured_tables</a><br />
-<a href="/services/cleanrooms/configured_tables_list_only/">configured_tables_list_only</a>
+<a href="/services/cleanrooms/configured_tables/">configured_tables</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/cleanrooms/id_mapping_tables/">id_mapping_tables</a><br />
-<a href="/services/cleanrooms/id_mapping_tables_list_only/">id_mapping_tables_list_only</a><br />
 <a href="/services/cleanrooms/id_namespace_associations/">id_namespace_associations</a><br />
-<a href="/services/cleanrooms/id_namespace_associations_list_only/">id_namespace_associations_list_only</a><br />
 <a href="/services/cleanrooms/memberships/">memberships</a><br />
-<a href="/services/cleanrooms/memberships_list_only/">memberships_list_only</a><br />
-<a href="/services/cleanrooms/privacy_budget_templates/">privacy_budget_templates</a><br />
-<a href="/services/cleanrooms/privacy_budget_templates_list_only/">privacy_budget_templates_list_only</a>
+<a href="/services/cleanrooms/privacy_budget_templates/">privacy_budget_templates</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/cleanrooms/memberships/index.md b/website/docs/services/cleanrooms/memberships/index.md
index b3116ecf4..b27c633fc 100644
--- a/website/docs/services/cleanrooms/memberships/index.md
+++ b/website/docs/services/cleanrooms/memberships/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>membership</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -236,6 +245,23 @@ Creates, updates, deletes or gets a <code>membership</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "membership_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-membership.html"><code>AWS::CleanRooms::Membership</code></a>.
 
@@ -245,31 +271,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>memberships</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CollaborationIdentifier, QueryLogStatus, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>memberships</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>memberships</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>memberships_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>memberships</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -278,6 +310,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>membership</code>.
 ```sql
 SELECT
@@ -296,6 +337,19 @@ payment_configuration
 FROM awscc.cleanrooms.memberships
 WHERE region = 'us-east-1' AND data__Identifier = '<MembershipIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>memberships</code> in a region.
+```sql
+SELECT
+region,
+membership_identifier
+FROM awscc.cleanrooms.memberships_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -405,6 +459,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cleanrooms.memberships
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "QueryLogStatus": query_log_status,
+    "JobLogStatus": job_log_status,
+    "DefaultResultConfiguration": default_result_configuration,
+    "DefaultJobResultConfiguration": default_job_result_configuration,
+    "PaymentConfiguration": payment_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<MembershipIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cleanrooms/memberships_list_only/index.md b/website/docs/services/cleanrooms/memberships_list_only/index.md
deleted file mode 100644
index d7290ac22..000000000
--- a/website/docs/services/cleanrooms/memberships_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: memberships_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - memberships_list_only
-  - cleanrooms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>memberships</code> in a region or regions, for all properties use <a href="/services/cleanrooms/memberships/"><code>memberships</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>memberships_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents an AWS account that is a part of a collaboration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cleanrooms.memberships_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "membership_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>memberships</code> in a region.
-```sql
-SELECT
-region,
-membership_identifier
-FROM awscc.cleanrooms.memberships_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>memberships_list_only</code> resource, see <a href="/services/cleanrooms/memberships/#permissions"><code>memberships</code></a>
-
diff --git a/website/docs/services/cleanrooms/privacy_budget_templates/index.md b/website/docs/services/cleanrooms/privacy_budget_templates/index.md
index ac1790dea..0d1a27f39 100644
--- a/website/docs/services/cleanrooms/privacy_budget_templates/index.md
+++ b/website/docs/services/cleanrooms/privacy_budget_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>privacy_budget_template</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -114,6 +123,28 @@ Creates, updates, deletes or gets a <code>privacy_budget_template</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "privacy_budget_template_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "membership_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-privacybudgettemplate.html"><code>AWS::CleanRooms::PrivacyBudgetTemplate</code></a>.
 
@@ -123,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>privacy_budget_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AutoRefresh, PrivacyBudgetType, Parameters, MembershipIdentifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>privacy_budget_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>privacy_budget_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>privacy_budget_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>privacy_budget_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>privacy_budget_template</code>.
 ```sql
 SELECT
@@ -173,6 +219,20 @@ membership_identifier
 FROM awscc.cleanrooms.privacy_budget_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<PrivacyBudgetTemplateIdentifier>|<MembershipIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>privacy_budget_templates</code> in a region.
+```sql
+SELECT
+region,
+privacy_budget_template_identifier,
+membership_identifier
+FROM awscc.cleanrooms.privacy_budget_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -259,6 +319,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cleanrooms.privacy_budget_templates
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Parameters": parameters
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PrivacyBudgetTemplateIdentifier>|<MembershipIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cleanrooms/privacy_budget_templates_list_only/index.md b/website/docs/services/cleanrooms/privacy_budget_templates_list_only/index.md
deleted file mode 100644
index 2c50b9653..000000000
--- a/website/docs/services/cleanrooms/privacy_budget_templates_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: privacy_budget_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - privacy_budget_templates_list_only
-  - cleanrooms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>privacy_budget_templates</code> in a region or regions, for all properties use <a href="/services/cleanrooms/privacy_budget_templates/"><code>privacy_budget_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>privacy_budget_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a privacy budget within a collaboration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cleanrooms.privacy_budget_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "privacy_budget_template_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "membership_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>privacy_budget_templates</code> in a region.
-```sql
-SELECT
-region,
-privacy_budget_template_identifier,
-membership_identifier
-FROM awscc.cleanrooms.privacy_budget_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>privacy_budget_templates_list_only</code> resource, see <a href="/services/cleanrooms/privacy_budget_templates/#permissions"><code>privacy_budget_templates</code></a>
-
diff --git a/website/docs/services/cleanroomsml/index.md b/website/docs/services/cleanroomsml/index.md
index 104c6328e..46a92ccf8 100644
--- a/website/docs/services/cleanroomsml/index.md
+++ b/website/docs/services/cleanroomsml/index.md
@@ -20,7 +20,7 @@ The cleanroomsml service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The cleanroomsml service documentation.
 <a href="/services/cleanroomsml/training_datasets/">training_datasets</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/cleanroomsml/training_datasets_list_only/">training_datasets_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/cleanroomsml/training_datasets/index.md b/website/docs/services/cleanroomsml/training_datasets/index.md
index a04c3ce14..c21d580ac 100644
--- a/website/docs/services/cleanroomsml/training_datasets/index.md
+++ b/website/docs/services/cleanroomsml/training_datasets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>training_dataset</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -130,6 +139,71 @@ Creates, updates, deletes or gets a <code>training_dataset</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "training_data",
+    "type": "array",
+    "description": "",
+    "children": [
+      {
+        "name": "type",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "input_config",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "schema",
+            "type": "array",
+            "description": "",
+            "children": [
+              {
+                "name": "column_name",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "column_types",
+                "type": "array",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "data_source",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "glue_data_source",
+                "type": "object",
+                "description": ""
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "training_dataset_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanroomsml-trainingdataset.html"><code>AWS::CleanRoomsML::TrainingDataset</code></a>.
 
@@ -139,31 +213,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>training_datasets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, RoleArn, TrainingData, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>training_datasets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>training_datasets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>training_datasets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>training_datasets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -172,6 +252,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>training_dataset</code>.
 ```sql
 SELECT
@@ -186,6 +275,19 @@ status
 FROM awscc.cleanroomsml.training_datasets
 WHERE region = 'us-east-1' AND data__Identifier = '<TrainingDatasetArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>training_datasets</code> in a region.
+```sql
+SELECT
+region,
+training_dataset_arn
+FROM awscc.cleanroomsml.training_datasets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -279,6 +381,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cleanroomsml.training_datasets
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TrainingDatasetArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cleanroomsml/training_datasets_list_only/index.md b/website/docs/services/cleanroomsml/training_datasets_list_only/index.md
deleted file mode 100644
index 6696d5088..000000000
--- a/website/docs/services/cleanroomsml/training_datasets_list_only/index.md
+++ /dev/null
@@ -1,128 +0,0 @@
----
-title: training_datasets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - training_datasets_list_only
-  - cleanroomsml
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>training_datasets</code> in a region or regions, for all properties use <a href="/services/cleanroomsml/training_datasets/"><code>training_datasets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>training_datasets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::CleanRoomsML::TrainingDataset Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cleanroomsml.training_datasets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "training_data",
-    "type": "array",
-    "description": "",
-    "children": [
-      {
-        "name": "type",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "input_config",
-        "type": "object",
-        "description": "",
-        "children": [
-          {
-            "name": "schema",
-            "type": "array",
-            "description": "",
-            "children": [
-              {
-                "name": "column_name",
-                "type": "string",
-                "description": ""
-              },
-              {
-                "name": "column_types",
-                "type": "array",
-                "description": ""
-              }
-            ]
-          },
-          {
-            "name": "data_source",
-            "type": "object",
-            "description": "",
-            "children": [
-              {
-                "name": "glue_data_source",
-                "type": "object",
-                "description": ""
-              }
-            ]
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "training_dataset_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>training_datasets</code> in a region.
-```sql
-SELECT
-region,
-training_dataset_arn
-FROM awscc.cleanroomsml.training_datasets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>training_datasets_list_only</code> resource, see <a href="/services/cleanroomsml/training_datasets/#permissions"><code>training_datasets</code></a>
-
diff --git a/website/docs/services/cloud_control/resource/index.md b/website/docs/services/cloud_control/resource/index.md
index 7a2c0cfb5..dbe6c1b3d 100644
--- a/website/docs/services/cloud_control/resource/index.md
+++ b/website/docs/services/cloud_control/resource/index.md
@@ -73,3 +73,4 @@ Represents information about a provisioned resource.
 
 
 
+
diff --git a/website/docs/services/cloud_control/resource_request/index.md b/website/docs/services/cloud_control/resource_request/index.md
index 32e4aaba4..d92935192 100644
--- a/website/docs/services/cloud_control/resource_request/index.md
+++ b/website/docs/services/cloud_control/resource_request/index.md
@@ -113,3 +113,4 @@ For more information about Amazon Web Services Cloud Control API, see the <a hre
 
 
 
+
diff --git a/website/docs/services/cloud_control/resource_requests/index.md b/website/docs/services/cloud_control/resource_requests/index.md
index 801323a66..960a4d643 100644
--- a/website/docs/services/cloud_control/resource_requests/index.md
+++ b/website/docs/services/cloud_control/resource_requests/index.md
@@ -68,3 +68,4 @@ For more information about Amazon Web Services Cloud Control API, see the <a hre
 
 
 
+
diff --git a/website/docs/services/cloud_control/resources/index.md b/website/docs/services/cloud_control/resources/index.md
index 8a2533a47..9ea171874 100644
--- a/website/docs/services/cloud_control/resources/index.md
+++ b/website/docs/services/cloud_control/resources/index.md
@@ -78,3 +78,4 @@ For more information about Amazon Web Services Cloud Control API, see the <a hre
 
 
 
+
diff --git a/website/docs/services/cloud_control/vw_cancelled_requests/index.md b/website/docs/services/cloud_control/vw_cancelled_requests/index.md
index 9d89f4f52..863857a31 100644
--- a/website/docs/services/cloud_control/vw_cancelled_requests/index.md
+++ b/website/docs/services/cloud_control/vw_cancelled_requests/index.md
@@ -58,3 +58,4 @@ Creates, updates, deletes or gets a <code>vw_cancelled_request</code> resource o
 
 
 
+
diff --git a/website/docs/services/cloud_control/vw_create_requests/index.md b/website/docs/services/cloud_control/vw_create_requests/index.md
index dcb9f493e..89d1d6a1f 100644
--- a/website/docs/services/cloud_control/vw_create_requests/index.md
+++ b/website/docs/services/cloud_control/vw_create_requests/index.md
@@ -58,3 +58,4 @@ Creates, updates, deletes or gets a <code>vw_create_request</code> resource or l
 
 
 
+
diff --git a/website/docs/services/cloud_control/vw_delete_requests/index.md b/website/docs/services/cloud_control/vw_delete_requests/index.md
index 0e83af00a..67eab5284 100644
--- a/website/docs/services/cloud_control/vw_delete_requests/index.md
+++ b/website/docs/services/cloud_control/vw_delete_requests/index.md
@@ -58,3 +58,4 @@ Creates, updates, deletes or gets a <code>vw_delete_request</code> resource or l
 
 
 
+
diff --git a/website/docs/services/cloud_control/vw_failed_requests/index.md b/website/docs/services/cloud_control/vw_failed_requests/index.md
index 2d1cbf89d..ac29cf081 100644
--- a/website/docs/services/cloud_control/vw_failed_requests/index.md
+++ b/website/docs/services/cloud_control/vw_failed_requests/index.md
@@ -58,3 +58,4 @@ Creates, updates, deletes or gets a <code>vw_failed_request</code> resource or l
 
 
 
+
diff --git a/website/docs/services/cloud_control/vw_pending_requests/index.md b/website/docs/services/cloud_control/vw_pending_requests/index.md
index 2a8d07e99..de0db9bb6 100644
--- a/website/docs/services/cloud_control/vw_pending_requests/index.md
+++ b/website/docs/services/cloud_control/vw_pending_requests/index.md
@@ -58,3 +58,4 @@ Creates, updates, deletes or gets a <code>vw_pending_request</code> resource or
 
 
 
+
diff --git a/website/docs/services/cloud_control/vw_successful_requests/index.md b/website/docs/services/cloud_control/vw_successful_requests/index.md
index fbc71c23b..72772ac55 100644
--- a/website/docs/services/cloud_control/vw_successful_requests/index.md
+++ b/website/docs/services/cloud_control/vw_successful_requests/index.md
@@ -58,3 +58,4 @@ Creates, updates, deletes or gets a <code>vw_successful_request</code> resource
 
 
 
+
diff --git a/website/docs/services/cloud_control/vw_update_requests/index.md b/website/docs/services/cloud_control/vw_update_requests/index.md
index 3411205c2..b4a66716f 100644
--- a/website/docs/services/cloud_control/vw_update_requests/index.md
+++ b/website/docs/services/cloud_control/vw_update_requests/index.md
@@ -58,3 +58,4 @@ Creates, updates, deletes or gets a <code>vw_update_request</code> resource or l
 
 
 
+
diff --git a/website/docs/services/cloudformation/guard_hooks/index.md b/website/docs/services/cloudformation/guard_hooks/index.md
index 93f89ca78..d51b8f0bb 100644
--- a/website/docs/services/cloudformation/guard_hooks/index.md
+++ b/website/docs/services/cloudformation/guard_hooks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>guard_hook</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "rule_location",
@@ -148,6 +157,23 @@ Creates, updates, deletes or gets a <code>guard_hook</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "hook_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the activated hook"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-guardhook.html"><code>AWS::CloudFormation::GuardHook</code></a>.
 
@@ -157,31 +183,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>guard_hooks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RuleLocation, HookStatus, TargetOperations, FailureMode, Alias, ExecutionRole, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>guard_hooks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>guard_hooks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>guard_hooks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>guard_hooks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -190,6 +222,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>guard_hook</code>.
 ```sql
 SELECT
@@ -208,6 +249,19 @@ options
 FROM awscc.cloudformation.guard_hooks
 WHERE region = 'us-east-1' AND data__Identifier = '<HookArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>guard_hooks</code> in a region.
+```sql
+SELECT
+region,
+hook_arn
+FROM awscc.cloudformation.guard_hooks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -328,6 +382,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudformation.guard_hooks
+SET data__PatchDocument = string('{{ {
+    "RuleLocation": rule_location,
+    "LogBucket": log_bucket,
+    "HookStatus": hook_status,
+    "TargetOperations": target_operations,
+    "FailureMode": failure_mode,
+    "TargetFilters": target_filters,
+    "StackFilters": stack_filters,
+    "Options": options
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<HookArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudformation/guard_hooks_list_only/index.md b/website/docs/services/cloudformation/guard_hooks_list_only/index.md
deleted file mode 100644
index 552e4e7e6..000000000
--- a/website/docs/services/cloudformation/guard_hooks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: guard_hooks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - guard_hooks_list_only
-  - cloudformation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>guard_hooks</code> in a region or regions, for all properties use <a href="/services/cloudformation/guard_hooks/"><code>guard_hooks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>guard_hooks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This is a CloudFormation resource for activating the first-party AWS::Hooks::GuardHook.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudformation.guard_hooks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "hook_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the activated hook"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>guard_hooks</code> in a region.
-```sql
-SELECT
-region,
-hook_arn
-FROM awscc.cloudformation.guard_hooks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>guard_hooks_list_only</code> resource, see <a href="/services/cloudformation/guard_hooks/#permissions"><code>guard_hooks</code></a>
-
diff --git a/website/docs/services/cloudformation/hook_default_versions/index.md b/website/docs/services/cloudformation/hook_default_versions/index.md
index e7a5ca36e..99f3e2ad7 100644
--- a/website/docs/services/cloudformation/hook_default_versions/index.md
+++ b/website/docs/services/cloudformation/hook_default_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>hook_default_version</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "type_version_arn",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets a <code>hook_default_version</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the type. This is used to uniquely identify a HookDefaultVersion"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-hookdefaultversion.html"><code>AWS::CloudFormation::HookDefaultVersion</code></a>.
 
@@ -69,26 +95,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>hook_default_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>hook_default_versions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>hook_default_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>hook_default_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +128,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>hook_default_version</code>.
 ```sql
 SELECT
@@ -108,6 +148,19 @@ version_id
 FROM awscc.cloudformation.hook_default_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>hook_default_versions</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.cloudformation.hook_default_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -180,6 +233,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudformation.hook_default_versions
+SET data__PatchDocument = string('{{ {
+    "TypeVersionArn": type_version_arn,
+    "TypeName": type_name,
+    "VersionId": version_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## Permissions
 
 To operate on the <code>hook_default_versions</code> resource, the following permissions are required:
diff --git a/website/docs/services/cloudformation/hook_default_versions_list_only/index.md b/website/docs/services/cloudformation/hook_default_versions_list_only/index.md
deleted file mode 100644
index ba33e264e..000000000
--- a/website/docs/services/cloudformation/hook_default_versions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: hook_default_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - hook_default_versions_list_only
-  - cloudformation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>hook_default_versions</code> in a region or regions, for all properties use <a href="/services/cloudformation/hook_default_versions/"><code>hook_default_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>hook_default_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Set a version as default version for a hook in CloudFormation Registry.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudformation.hook_default_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the type. This is used to uniquely identify a HookDefaultVersion"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>hook_default_versions</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.cloudformation.hook_default_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>hook_default_versions_list_only</code> resource, see <a href="/services/cloudformation/hook_default_versions/#permissions"><code>hook_default_versions</code></a>
-
diff --git a/website/docs/services/cloudformation/hook_type_configs/index.md b/website/docs/services/cloudformation/hook_type_configs/index.md
index 043dbad82..e966df46e 100644
--- a/website/docs/services/cloudformation/hook_type_configs/index.md
+++ b/website/docs/services/cloudformation/hook_type_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>hook_type_config</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "type_arn",
@@ -65,6 +74,28 @@ Creates, updates, deletes or gets a <code>hook_type_config</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "configuration_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) for the configuration data, in this account and region."
+  },
+  {
+    "name": "configuration",
+    "type": "string",
+    "description": "The configuration data for the extension, in this account and region."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-hooktypeconfig.html"><code>AWS::CloudFormation::HookTypeConfig</code></a>.
 
@@ -74,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>hook_type_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>hook_type_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>hook_type_configs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>hook_type_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>hook_type_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>hook_type_config</code>.
 ```sql
 SELECT
@@ -119,6 +165,19 @@ configuration_alias
 FROM awscc.cloudformation.hook_type_configs
 WHERE region = 'us-east-1' AND data__Identifier = '<ConfigurationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>hook_type_configs</code> in a region.
+```sql
+SELECT
+region,
+configuration_arn
+FROM awscc.cloudformation.hook_type_configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -197,6 +256,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudformation.hook_type_configs
+SET data__PatchDocument = string('{{ {
+    "TypeArn": type_arn,
+    "TypeName": type_name,
+    "Configuration": configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConfigurationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudformation/hook_type_configs_list_only/index.md b/website/docs/services/cloudformation/hook_type_configs_list_only/index.md
deleted file mode 100644
index 6d98d9c08..000000000
--- a/website/docs/services/cloudformation/hook_type_configs_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: hook_type_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - hook_type_configs_list_only
-  - cloudformation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>hook_type_configs</code> in a region or regions, for all properties use <a href="/services/cloudformation/hook_type_configs/"><code>hook_type_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>hook_type_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies the configuration data for a registered hook in CloudFormation Registry.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudformation.hook_type_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "configuration_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) for the configuration data, in this account and region."
-  },
-  {
-    "name": "configuration",
-    "type": "string",
-    "description": "The configuration data for the extension, in this account and region."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>hook_type_configs</code> in a region.
-```sql
-SELECT
-region,
-configuration_arn
-FROM awscc.cloudformation.hook_type_configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>hook_type_configs_list_only</code> resource, see <a href="/services/cloudformation/hook_type_configs/#permissions"><code>hook_type_configs</code></a>
-
diff --git a/website/docs/services/cloudformation/hook_versions/index.md b/website/docs/services/cloudformation/hook_versions/index.md
index ee9a81fd8..2d6efeb11 100644
--- a/website/docs/services/cloudformation/hook_versions/index.md
+++ b/website/docs/services/cloudformation/hook_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>hook_version</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>hook_version</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the type, here the HookVersion. This is used to uniquely identify a HookVersion resource"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-hookversion.html"><code>AWS::CloudFormation::HookVersion</code></a>.
 
@@ -106,26 +132,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>hook_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SchemaHandlerPackage, TypeName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>hook_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>hook_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>hook_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +165,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>hook_version</code>.
 ```sql
 SELECT
@@ -150,6 +190,19 @@ visibility
 FROM awscc.cloudformation.hook_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>hook_versions</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.cloudformation.hook_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -226,6 +279,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudformation/hook_versions_list_only/index.md b/website/docs/services/cloudformation/hook_versions_list_only/index.md
deleted file mode 100644
index d6d382bba..000000000
--- a/website/docs/services/cloudformation/hook_versions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: hook_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - hook_versions_list_only
-  - cloudformation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>hook_versions</code> in a region or regions, for all properties use <a href="/services/cloudformation/hook_versions/"><code>hook_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>hook_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Publishes new or first hook version to AWS CloudFormation Registry.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudformation.hook_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the type, here the HookVersion. This is used to uniquely identify a HookVersion resource"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>hook_versions</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.cloudformation.hook_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>hook_versions_list_only</code> resource, see <a href="/services/cloudformation/hook_versions/#permissions"><code>hook_versions</code></a>
-
diff --git a/website/docs/services/cloudformation/index.md b/website/docs/services/cloudformation/index.md
index f6d864469..2949e3c3c 100644
--- a/website/docs/services/cloudformation/index.md
+++ b/website/docs/services/cloudformation/index.md
@@ -20,7 +20,7 @@ The cloudformation service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>27</b></span><br />
+<span>total resources:&nbsp;<b>14</b></span><br />
 </div>
 </div>
 
@@ -30,33 +30,20 @@ The cloudformation service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/cloudformation/guard_hooks/">guard_hooks</a><br />
-<a href="/services/cloudformation/guard_hooks_list_only/">guard_hooks_list_only</a><br />
 <a href="/services/cloudformation/hook_default_versions/">hook_default_versions</a><br />
-<a href="/services/cloudformation/hook_default_versions_list_only/">hook_default_versions_list_only</a><br />
 <a href="/services/cloudformation/hook_type_configs/">hook_type_configs</a><br />
-<a href="/services/cloudformation/hook_type_configs_list_only/">hook_type_configs_list_only</a><br />
 <a href="/services/cloudformation/hook_versions/">hook_versions</a><br />
-<a href="/services/cloudformation/hook_versions_list_only/">hook_versions_list_only</a><br />
 <a href="/services/cloudformation/lambda_hooks/">lambda_hooks</a><br />
-<a href="/services/cloudformation/lambda_hooks_list_only/">lambda_hooks_list_only</a><br />
 <a href="/services/cloudformation/module_default_versions/">module_default_versions</a><br />
-<a href="/services/cloudformation/module_default_versions_list_only/">module_default_versions_list_only</a><br />
-<a href="/services/cloudformation/module_versions/">module_versions</a><br />
-<a href="/services/cloudformation/public_type_versions/">public_type_versions</a>
+<a href="/services/cloudformation/module_versions/">module_versions</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/cloudformation/public_type_versions_list_only/">public_type_versions_list_only</a><br />
+<a href="/services/cloudformation/public_type_versions/">public_type_versions</a><br />
 <a href="/services/cloudformation/publishers/">publishers</a><br />
-<a href="/services/cloudformation/publishers_list_only/">publishers_list_only</a><br />
 <a href="/services/cloudformation/resource_default_versions/">resource_default_versions</a><br />
-<a href="/services/cloudformation/resource_default_versions_list_only/">resource_default_versions_list_only</a><br />
 <a href="/services/cloudformation/resource_versions/">resource_versions</a><br />
-<a href="/services/cloudformation/resource_versions_list_only/">resource_versions_list_only</a><br />
 <a href="/services/cloudformation/stack_sets/">stack_sets</a><br />
-<a href="/services/cloudformation/stack_sets_list_only/">stack_sets_list_only</a><br />
 <a href="/services/cloudformation/stacks/">stacks</a><br />
-<a href="/services/cloudformation/stacks_list_only/">stacks_list_only</a><br />
-<a href="/services/cloudformation/type_activations/">type_activations</a><br />
-<a href="/services/cloudformation/type_activations_list_only/">type_activations_list_only</a>
+<a href="/services/cloudformation/type_activations/">type_activations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/cloudformation/lambda_hooks/index.md b/website/docs/services/cloudformation/lambda_hooks/index.md
index a6739a493..c9cd76f09 100644
--- a/website/docs/services/cloudformation/lambda_hooks/index.md
+++ b/website/docs/services/cloudformation/lambda_hooks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>lambda_hook</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "lambda_function",
@@ -126,6 +135,23 @@ Creates, updates, deletes or gets a <code>lambda_hook</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "hook_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the activated hook"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-lambdahook.html"><code>AWS::CloudFormation::LambdaHook</code></a>.
 
@@ -135,31 +161,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>lambda_hooks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LambdaFunction, FailureMode, Alias, ExecutionRole, TargetOperations, HookStatus, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>lambda_hooks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>lambda_hooks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>lambda_hooks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>lambda_hooks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -168,6 +200,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>lambda_hook</code>.
 ```sql
 SELECT
@@ -184,6 +225,19 @@ execution_role
 FROM awscc.cloudformation.lambda_hooks
 WHERE region = 'us-east-1' AND data__Identifier = '<HookArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>lambda_hooks</code> in a region.
+```sql
+SELECT
+region,
+hook_arn
+FROM awscc.cloudformation.lambda_hooks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -294,6 +348,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudformation.lambda_hooks
+SET data__PatchDocument = string('{{ {
+    "LambdaFunction": lambda_function,
+    "HookStatus": hook_status,
+    "TargetOperations": target_operations,
+    "FailureMode": failure_mode,
+    "TargetFilters": target_filters,
+    "StackFilters": stack_filters,
+    "ExecutionRole": execution_role
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<HookArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudformation/lambda_hooks_list_only/index.md b/website/docs/services/cloudformation/lambda_hooks_list_only/index.md
deleted file mode 100644
index a2d753e9d..000000000
--- a/website/docs/services/cloudformation/lambda_hooks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: lambda_hooks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - lambda_hooks_list_only
-  - cloudformation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>lambda_hooks</code> in a region or regions, for all properties use <a href="/services/cloudformation/lambda_hooks/"><code>lambda_hooks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>lambda_hooks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This is a CloudFormation resource for the first-party AWS::Hooks::LambdaHook.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudformation.lambda_hooks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "hook_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the activated hook"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>lambda_hooks</code> in a region.
-```sql
-SELECT
-region,
-hook_arn
-FROM awscc.cloudformation.lambda_hooks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>lambda_hooks_list_only</code> resource, see <a href="/services/cloudformation/lambda_hooks/#permissions"><code>lambda_hooks</code></a>
-
diff --git a/website/docs/services/cloudformation/module_default_versions/index.md b/website/docs/services/cloudformation/module_default_versions/index.md
index 92baa9670..6d6b5a15d 100644
--- a/website/docs/services/cloudformation/module_default_versions/index.md
+++ b/website/docs/services/cloudformation/module_default_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>module_default_version</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets a <code>module_default_version</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the module version to set as the default version."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-moduledefaultversion.html"><code>AWS::CloudFormation::ModuleDefaultVersion</code></a>.
 
@@ -64,21 +90,25 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>module_default_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>module_default_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>module_default_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +117,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>module_default_version</code>.
 ```sql
 SELECT
@@ -97,6 +136,19 @@ version_id
 FROM awscc.cloudformation.module_default_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>module_default_versions</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.cloudformation.module_default_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -169,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## Permissions
 
 To operate on the <code>module_default_versions</code> resource, the following permissions are required:
diff --git a/website/docs/services/cloudformation/module_default_versions_list_only/index.md b/website/docs/services/cloudformation/module_default_versions_list_only/index.md
deleted file mode 100644
index 8a12232de..000000000
--- a/website/docs/services/cloudformation/module_default_versions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: module_default_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - module_default_versions_list_only
-  - cloudformation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>module_default_versions</code> in a region or regions, for all properties use <a href="/services/cloudformation/module_default_versions/"><code>module_default_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>module_default_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A module that has been registered in the CloudFormation registry as the default version</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudformation.module_default_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the module version to set as the default version."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>module_default_versions</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.cloudformation.module_default_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>module_default_versions_list_only</code> resource, see <a href="/services/cloudformation/module_default_versions/#permissions"><code>module_default_versions</code></a>
-
diff --git a/website/docs/services/cloudformation/module_versions/index.md b/website/docs/services/cloudformation/module_versions/index.md
index 5b8d59cb1..d162d126d 100644
--- a/website/docs/services/cloudformation/module_versions/index.md
+++ b/website/docs/services/cloudformation/module_versions/index.md
@@ -205,6 +205,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudformation/public_type_versions/index.md b/website/docs/services/cloudformation/public_type_versions/index.md
index 3aacf1f0b..f6c0fb77d 100644
--- a/website/docs/services/cloudformation/public_type_versions/index.md
+++ b/website/docs/services/cloudformation/public_type_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>public_type_version</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -80,6 +89,33 @@ Creates, updates, deletes or gets a <code>public_type_version</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Number (ARN) of the extension."
+  },
+  {
+    "name": "public_type_arn",
+    "type": "string",
+    "description": "The Amazon Resource Number (ARN) assigned to the public extension upon publication"
+  },
+  {
+    "name": "type",
+    "type": "string",
+    "description": "The kind of extension"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publictypeversion.html"><code>AWS::CloudFormation::PublicTypeVersion</code></a>.
 
@@ -89,21 +125,25 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>public_type_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>public_type_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>public_type_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +152,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>public_type_version</code>.
 ```sql
 SELECT
@@ -127,6 +176,19 @@ type
 FROM awscc.cloudformation.public_type_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<PublicTypeArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>public_type_versions</code> in a region.
+```sql
+SELECT
+region,
+public_type_arn
+FROM awscc.cloudformation.public_type_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -211,6 +273,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## Permissions
 
 To operate on the <code>public_type_versions</code> resource, the following permissions are required:
diff --git a/website/docs/services/cloudformation/public_type_versions_list_only/index.md b/website/docs/services/cloudformation/public_type_versions_list_only/index.md
deleted file mode 100644
index 15e1fc934..000000000
--- a/website/docs/services/cloudformation/public_type_versions_list_only/index.md
+++ /dev/null
@@ -1,90 +0,0 @@
----
-title: public_type_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - public_type_versions_list_only
-  - cloudformation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>public_type_versions</code> in a region or regions, for all properties use <a href="/services/cloudformation/public_type_versions/"><code>public_type_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>public_type_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Test and Publish a resource that has been registered in the CloudFormation Registry.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudformation.public_type_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Number (ARN) of the extension."
-  },
-  {
-    "name": "public_type_arn",
-    "type": "string",
-    "description": "The Amazon Resource Number (ARN) assigned to the public extension upon publication"
-  },
-  {
-    "name": "type",
-    "type": "string",
-    "description": "The kind of extension"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>public_type_versions</code> in a region.
-```sql
-SELECT
-region,
-public_type_arn
-FROM awscc.cloudformation.public_type_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>public_type_versions_list_only</code> resource, see <a href="/services/cloudformation/public_type_versions/#permissions"><code>public_type_versions</code></a>
-
diff --git a/website/docs/services/cloudformation/publishers/index.md b/website/docs/services/cloudformation/publishers/index.md
index 993118862..3547cdb7a 100644
--- a/website/docs/services/cloudformation/publishers/index.md
+++ b/website/docs/services/cloudformation/publishers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>publisher</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "accept_terms_and_conditions",
@@ -70,6 +79,23 @@ Creates, updates, deletes or gets a <code>publisher</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "publisher_id",
+    "type": "string",
+    "description": "The reserved publisher id for this type, or the publisher id assigned by CloudFormation for publishing in this region."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publisher.html"><code>AWS::CloudFormation::Publisher</code></a>.
 
@@ -79,21 +105,25 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>publishers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AcceptTermsAndConditions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>publishers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>publishers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +132,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>publisher</code>.
 ```sql
 SELECT
@@ -115,6 +154,19 @@ identity_provider
 FROM awscc.cloudformation.publishers
 WHERE region = 'us-east-1' AND data__Identifier = '<PublisherId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>publishers</code> in a region.
+```sql
+SELECT
+region,
+publisher_id
+FROM awscc.cloudformation.publishers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -179,6 +231,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## Permissions
 
 To operate on the <code>publishers</code> resource, the following permissions are required:
diff --git a/website/docs/services/cloudformation/publishers_list_only/index.md b/website/docs/services/cloudformation/publishers_list_only/index.md
deleted file mode 100644
index beade39e9..000000000
--- a/website/docs/services/cloudformation/publishers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: publishers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - publishers_list_only
-  - cloudformation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>publishers</code> in a region or regions, for all properties use <a href="/services/cloudformation/publishers/"><code>publishers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>publishers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Register as a publisher in the CloudFormation Registry.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudformation.publishers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "publisher_id",
-    "type": "string",
-    "description": "The reserved publisher id for this type, or the publisher id assigned by CloudFormation for publishing in this region."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>publishers</code> in a region.
-```sql
-SELECT
-region,
-publisher_id
-FROM awscc.cloudformation.publishers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>publishers_list_only</code> resource, see <a href="/services/cloudformation/publishers/#permissions"><code>publishers</code></a>
-
diff --git a/website/docs/services/cloudformation/resource_default_versions/index.md b/website/docs/services/cloudformation/resource_default_versions/index.md
index d99ff9d8a..abc137c23 100644
--- a/website/docs/services/cloudformation/resource_default_versions/index.md
+++ b/website/docs/services/cloudformation/resource_default_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_default_version</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "version_id",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets a <code>resource_default_version</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the type. This is used to uniquely identify a ResourceDefaultVersion"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourcedefaultversion.html"><code>AWS::CloudFormation::ResourceDefaultVersion</code></a>.
 
@@ -69,31 +95,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_default_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_default_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_default_versions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_default_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_default_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +134,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_default_version</code>.
 ```sql
 SELECT
@@ -113,6 +154,19 @@ type_version_arn
 FROM awscc.cloudformation.resource_default_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_default_versions</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.cloudformation.resource_default_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -185,6 +239,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudformation.resource_default_versions
+SET data__PatchDocument = string('{{ {
+    "VersionId": version_id,
+    "TypeName": type_name,
+    "TypeVersionArn": type_version_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudformation/resource_default_versions_list_only/index.md b/website/docs/services/cloudformation/resource_default_versions_list_only/index.md
deleted file mode 100644
index 546adfcc0..000000000
--- a/website/docs/services/cloudformation/resource_default_versions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_default_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_default_versions_list_only
-  - cloudformation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_default_versions</code> in a region or regions, for all properties use <a href="/services/cloudformation/resource_default_versions/"><code>resource_default_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_default_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The default version of a resource that has been registered in the CloudFormation Registry.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudformation.resource_default_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the type. This is used to uniquely identify a ResourceDefaultVersion"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_default_versions</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.cloudformation.resource_default_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_default_versions_list_only</code> resource, see <a href="/services/cloudformation/resource_default_versions/#permissions"><code>resource_default_versions</code></a>
-
diff --git a/website/docs/services/cloudformation/resource_versions/index.md b/website/docs/services/cloudformation/resource_versions/index.md
index 99fb89324..03e85806c 100644
--- a/website/docs/services/cloudformation/resource_versions/index.md
+++ b/website/docs/services/cloudformation/resource_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_version</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets a <code>resource_version</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the type, here the ResourceVersion. This is used to uniquely identify a ResourceVersion resource"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourceversion.html"><code>AWS::CloudFormation::ResourceVersion</code></a>.
 
@@ -111,26 +137,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SchemaHandlerPackage, TypeName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +170,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_version</code>.
 ```sql
 SELECT
@@ -156,6 +196,19 @@ visibility
 FROM awscc.cloudformation.resource_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_versions</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.cloudformation.resource_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -232,6 +285,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudformation/resource_versions_list_only/index.md b/website/docs/services/cloudformation/resource_versions_list_only/index.md
deleted file mode 100644
index cb2b3af2f..000000000
--- a/website/docs/services/cloudformation/resource_versions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_versions_list_only
-  - cloudformation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_versions</code> in a region or regions, for all properties use <a href="/services/cloudformation/resource_versions/"><code>resource_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A resource that has been registered in the CloudFormation Registry.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudformation.resource_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the type, here the ResourceVersion. This is used to uniquely identify a ResourceVersion resource"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_versions</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.cloudformation.resource_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_versions_list_only</code> resource, see <a href="/services/cloudformation/resource_versions/#permissions"><code>resource_versions</code></a>
-
diff --git a/website/docs/services/cloudformation/stack_sets/index.md b/website/docs/services/cloudformation/stack_sets/index.md
index 4ca1344bb..3e5a8b10a 100644
--- a/website/docs/services/cloudformation/stack_sets/index.md
+++ b/website/docs/services/cloudformation/stack_sets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>stack_set</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "stack_set_name",
@@ -251,6 +260,23 @@ Creates, updates, deletes or gets a <code>stack_set</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "stack_set_id",
+    "type": "string",
+    "description": "The ID of the stack set that you're creating."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html"><code>AWS::CloudFormation::StackSet</code></a>.
 
@@ -260,31 +286,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>stack_sets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="StackSetName, PermissionModel, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>stack_sets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>stack_sets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>stack_sets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>stack_sets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -293,6 +325,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>stack_set</code>.
 ```sql
 SELECT
@@ -316,6 +357,19 @@ managed_execution
 FROM awscc.cloudformation.stack_sets
 WHERE region = 'us-east-1' AND data__Identifier = '<StackSetId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>stack_sets</code> in a region.
+```sql
+SELECT
+region,
+stack_set_id
+FROM awscc.cloudformation.stack_sets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -461,6 +515,31 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudformation.stack_sets
+SET data__PatchDocument = string('{{ {
+    "AdministrationRoleARN": administration_role_arn,
+    "AutoDeployment": auto_deployment,
+    "Capabilities": capabilities,
+    "Description": description,
+    "ExecutionRoleName": execution_role_name,
+    "OperationPreferences": operation_preferences,
+    "StackInstancesGroup": stack_instances_group,
+    "Parameters": parameters,
+    "Tags": tags,
+    "TemplateBody": template_body,
+    "TemplateURL": template_url,
+    "CallAs": call_as,
+    "ManagedExecution": managed_execution
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<StackSetId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudformation/stack_sets_list_only/index.md b/website/docs/services/cloudformation/stack_sets_list_only/index.md
deleted file mode 100644
index b3ddfc6eb..000000000
--- a/website/docs/services/cloudformation/stack_sets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: stack_sets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - stack_sets_list_only
-  - cloudformation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>stack_sets</code> in a region or regions, for all properties use <a href="/services/cloudformation/stack_sets/"><code>stack_sets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>stack_sets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>StackSet as a resource provides one-click experience for provisioning a StackSet and StackInstances</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudformation.stack_sets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "stack_set_id",
-    "type": "string",
-    "description": "The ID of the stack set that you're creating."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>stack_sets</code> in a region.
-```sql
-SELECT
-region,
-stack_set_id
-FROM awscc.cloudformation.stack_sets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>stack_sets_list_only</code> resource, see <a href="/services/cloudformation/stack_sets/#permissions"><code>stack_sets</code></a>
-
diff --git a/website/docs/services/cloudformation/stacks/index.md b/website/docs/services/cloudformation/stacks/index.md
index 60331c436..390bc6e24 100644
--- a/website/docs/services/cloudformation/stacks/index.md
+++ b/website/docs/services/cloudformation/stacks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>stack</code> resource or lists <code>s
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "capabilities",
@@ -189,6 +198,23 @@ Creates, updates, deletes or gets a <code>stack</code> resource or lists <code>s
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "stack_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stack.html"><code>AWS::CloudFormation::Stack</code></a>.
 
@@ -198,31 +224,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>stacks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="StackName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>stacks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>stacks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>stacks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>stacks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -231,6 +263,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>stack</code>.
 ```sql
 SELECT
@@ -261,6 +302,19 @@ creation_time
 FROM awscc.cloudformation.stacks
 WHERE region = 'us-east-1' AND data__Identifier = '<StackId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>stacks</code> in a region.
+```sql
+SELECT
+region,
+stack_id
+FROM awscc.cloudformation.stacks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -381,6 +435,32 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudformation.stacks
+SET data__PatchDocument = string('{{ {
+    "Capabilities": capabilities,
+    "RoleARN": role_arn,
+    "Description": description,
+    "DisableRollback": disable_rollback,
+    "EnableTerminationProtection": enable_termination_protection,
+    "NotificationARNs": notification_arns,
+    "Parameters": parameters,
+    "StackPolicyBody": stack_policy_body,
+    "StackPolicyURL": stack_policy_url,
+    "StackStatusReason": stack_status_reason,
+    "Tags": tags,
+    "TemplateBody": template_body,
+    "TemplateURL": template_url,
+    "TimeoutInMinutes": timeout_in_minutes
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<StackId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudformation/stacks_list_only/index.md b/website/docs/services/cloudformation/stacks_list_only/index.md
deleted file mode 100644
index 027d1397f..000000000
--- a/website/docs/services/cloudformation/stacks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: stacks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - stacks_list_only
-  - cloudformation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>stacks</code> in a region or regions, for all properties use <a href="/services/cloudformation/stacks/"><code>stacks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>stacks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::CloudFormation::Stack resource nests a stack as a resource in a top-level template.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudformation.stacks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "stack_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>stacks</code> in a region.
-```sql
-SELECT
-region,
-stack_id
-FROM awscc.cloudformation.stacks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>stacks_list_only</code> resource, see <a href="/services/cloudformation/stacks/#permissions"><code>stacks</code></a>
-
diff --git a/website/docs/services/cloudformation/type_activations/index.md b/website/docs/services/cloudformation/type_activations/index.md
index 0dd17b1ce..9dcadc9cd 100644
--- a/website/docs/services/cloudformation/type_activations/index.md
+++ b/website/docs/services/cloudformation/type_activations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>type_activation</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -107,6 +116,23 @@ Creates, updates, deletes or gets a <code>type_activation</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the extension."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html"><code>AWS::CloudFormation::TypeActivation</code></a>.
 
@@ -116,31 +142,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>type_activations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>type_activations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>type_activations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>type_activations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>type_activations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -149,6 +181,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>type_activation</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ type
 FROM awscc.cloudformation.type_activations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>type_activations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.cloudformation.type_activations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -283,6 +337,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudformation.type_activations
+SET data__PatchDocument = string('{{ {
+    "ExecutionRoleArn": execution_role_arn,
+    "PublisherId": publisher_id,
+    "PublicTypeArn": public_type_arn,
+    "AutoUpdate": auto_update,
+    "TypeNameAlias": type_name_alias,
+    "VersionBump": version_bump,
+    "MajorVersion": major_version,
+    "TypeName": type_name,
+    "Type": type
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudformation/type_activations_list_only/index.md b/website/docs/services/cloudformation/type_activations_list_only/index.md
deleted file mode 100644
index 479f52d49..000000000
--- a/website/docs/services/cloudformation/type_activations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: type_activations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - type_activations_list_only
-  - cloudformation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>type_activations</code> in a region or regions, for all properties use <a href="/services/cloudformation/type_activations/"><code>type_activations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>type_activations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Enable a resource that has been published in the CloudFormation Registry.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudformation.type_activations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the extension."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>type_activations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.cloudformation.type_activations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>type_activations_list_only</code> resource, see <a href="/services/cloudformation/type_activations/#permissions"><code>type_activations</code></a>
-
diff --git a/website/docs/services/cloudfront/anycast_ip_lists/index.md b/website/docs/services/cloudfront/anycast_ip_lists/index.md
index 9be234f86..4c71e11a0 100644
--- a/website/docs/services/cloudfront/anycast_ip_lists/index.md
+++ b/website/docs/services/cloudfront/anycast_ip_lists/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>anycast_ip_list</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "anycast_ip_list",
@@ -135,6 +144,23 @@ Creates, updates, deletes or gets an <code>anycast_ip_list</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-anycastiplist.html"><code>AWS::CloudFront::AnycastIpList</code></a>.
 
@@ -144,26 +170,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>anycast_ip_lists</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IpCount, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>anycast_ip_lists</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>anycast_ip_lists_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>anycast_ip_lists</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -172,6 +203,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>anycast_ip_list</code>.
 ```sql
 SELECT
@@ -185,6 +225,19 @@ tags
 FROM awscc.cloudfront.anycast_ip_lists
 WHERE data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>anycast_ip_lists</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.cloudfront.anycast_ip_lists_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -258,6 +311,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/anycast_ip_lists_list_only/index.md b/website/docs/services/cloudfront/anycast_ip_lists_list_only/index.md
deleted file mode 100644
index 1e3c2c852..000000000
--- a/website/docs/services/cloudfront/anycast_ip_lists_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: anycast_ip_lists_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - anycast_ip_lists_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>anycast_ip_lists</code> in a region or regions, for all properties use <a href="/services/cloudfront/anycast_ip_lists/"><code>anycast_ip_lists</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>anycast_ip_lists_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An Anycast static IP list. For more information, see &#91;Request Anycast static IPs to use for allowlisting&#93;(https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/request-static-ips.html) in the &#42;Amazon CloudFront Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.anycast_ip_lists_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>anycast_ip_lists</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.cloudfront.anycast_ip_lists_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>anycast_ip_lists_list_only</code> resource, see <a href="/services/cloudfront/anycast_ip_lists/#permissions"><code>anycast_ip_lists</code></a>
-
diff --git a/website/docs/services/cloudfront/cache_policies/index.md b/website/docs/services/cloudfront/cache_policies/index.md
index b15f00a08..a0956b599 100644
--- a/website/docs/services/cloudfront/cache_policies/index.md
+++ b/website/docs/services/cloudfront/cache_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cache_policy</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cache_policy_config",
@@ -150,6 +159,23 @@ Creates, updates, deletes or gets a <code>cache_policy</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-cachepolicy.html"><code>AWS::CloudFront::CachePolicy</code></a>.
 
@@ -159,31 +185,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cache_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CachePolicyConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cache_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cache_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cache_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cache_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -192,6 +224,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cache_policy</code>.
 ```sql
 SELECT
@@ -202,6 +243,19 @@ last_modified_time
 FROM awscc.cloudfront.cache_policies
 WHERE data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cache_policies</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.cloudfront.cache_policies_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -282,6 +336,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudfront.cache_policies
+SET data__PatchDocument = string('{{ {
+    "CachePolicyConfig": cache_policy_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/cache_policies_list_only/index.md b/website/docs/services/cloudfront/cache_policies_list_only/index.md
deleted file mode 100644
index cc02c4832..000000000
--- a/website/docs/services/cloudfront/cache_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: cache_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cache_policies_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cache_policies</code> in a region or regions, for all properties use <a href="/services/cloudfront/cache_policies/"><code>cache_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cache_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A cache policy.<br />When it's attached to a cache behavior, the cache policy determines the following:<br />+ The values that CloudFront includes in the cache key. These values can include HTTP headers, cookies, and URL query strings. CloudFront uses the cache key to find an object in its cache that it can return to the viewer.<br />+ The default, minimum, and maximum time to live (TTL) values that you want objects to stay in the CloudFront cache.<br /><br />The headers, cookies, and query strings that are included in the cache key are also included in requests that CloudFront sends to the origin. CloudFront sends a request when it can't find a valid object in its cache that matches the request's cache key. If you want to send values to the origin but &#42;not&#42; include them in the cache key, use &#96;&#96;OriginRequestPolicy&#96;&#96;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.cache_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cache_policies</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.cloudfront.cache_policies_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cache_policies_list_only</code> resource, see <a href="/services/cloudfront/cache_policies/#permissions"><code>cache_policies</code></a>
-
diff --git a/website/docs/services/cloudfront/cloud_front_origin_access_identities/index.md b/website/docs/services/cloudfront/cloud_front_origin_access_identities/index.md
index 73fe5d103..3b1a9caf7 100644
--- a/website/docs/services/cloudfront/cloud_front_origin_access_identities/index.md
+++ b/website/docs/services/cloudfront/cloud_front_origin_access_identities/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cloud_front_origin_access_identity</co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cloud_front_origin_access_identity_config",
@@ -62,6 +71,23 @@ Creates, updates, deletes or gets a <code>cloud_front_origin_access_identity</co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-cloudfrontoriginaccessidentity.html"><code>AWS::CloudFront::CloudFrontOriginAccessIdentity</code></a>.
 
@@ -71,31 +97,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cloud_front_origin_access_identities</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CloudFrontOriginAccessIdentityConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cloud_front_origin_access_identities</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cloud_front_origin_access_identities</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cloud_front_origin_access_identities_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cloud_front_origin_access_identities</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -104,6 +136,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cloud_front_origin_access_identity</code>.
 ```sql
 SELECT
@@ -114,6 +155,19 @@ s3_canonical_user_id
 FROM awscc.cloudfront.cloud_front_origin_access_identities
 WHERE data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cloud_front_origin_access_identities</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.cloudfront.cloud_front_origin_access_identities_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -175,6 +229,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudfront.cloud_front_origin_access_identities
+SET data__PatchDocument = string('{{ {
+    "CloudFrontOriginAccessIdentityConfig": cloud_front_origin_access_identity_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/cloud_front_origin_access_identities_list_only/index.md b/website/docs/services/cloudfront/cloud_front_origin_access_identities_list_only/index.md
deleted file mode 100644
index 31b566e07..000000000
--- a/website/docs/services/cloudfront/cloud_front_origin_access_identities_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: cloud_front_origin_access_identities_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cloud_front_origin_access_identities_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cloud_front_origin_access_identities</code> in a region or regions, for all properties use <a href="/services/cloudfront/cloud_front_origin_access_identities/"><code>cloud_front_origin_access_identities</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cloud_front_origin_access_identities_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The request to create a new origin access identity (OAI). An origin access identity is a special CloudFront user that you can associate with Amazon S3 origins, so that you can secure all or just some of your Amazon S3 content. For more information, see &#91;Restricting Access to Amazon S3 Content by Using an Origin Access Identity&#93;(https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/private-content-restricting-access-to-s3.html) in the &#42;Amazon CloudFront Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.cloud_front_origin_access_identities_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cloud_front_origin_access_identities</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.cloudfront.cloud_front_origin_access_identities_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cloud_front_origin_access_identities_list_only</code> resource, see <a href="/services/cloudfront/cloud_front_origin_access_identities/#permissions"><code>cloud_front_origin_access_identities</code></a>
-
diff --git a/website/docs/services/cloudfront/connection_groups/index.md b/website/docs/services/cloudfront/connection_groups/index.md
index 68ea83ba9..890b608df 100644
--- a/website/docs/services/cloudfront/connection_groups/index.md
+++ b/website/docs/services/cloudfront/connection_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>connection_group</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -117,6 +126,23 @@ Creates, updates, deletes or gets a <code>connection_group</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-connectiongroup.html"><code>AWS::CloudFront::ConnectionGroup</code></a>.
 
@@ -126,31 +152,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>connection_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>connection_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>connection_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>connection_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>connection_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -159,6 +191,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>connection_group</code>.
 ```sql
 SELECT
@@ -179,6 +220,19 @@ e_tag
 FROM awscc.cloudfront.connection_groups
 WHERE data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>connection_groups</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.cloudfront.connection_groups_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -257,6 +311,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudfront.connection_groups
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Ipv6Enabled": ipv6_enabled,
+    "AnycastIpListId": anycast_ip_list_id,
+    "Enabled": enabled
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/connection_groups_list_only/index.md b/website/docs/services/cloudfront/connection_groups_list_only/index.md
deleted file mode 100644
index 67691c60a..000000000
--- a/website/docs/services/cloudfront/connection_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: connection_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - connection_groups_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>connection_groups</code> in a region or regions, for all properties use <a href="/services/cloudfront/connection_groups/"><code>connection_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>connection_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The connection group for your distribution tenants. When you first create a distribution tenant and you don't specify a connection group, CloudFront will automatically create a default connection group for you. When you create a new distribution tenant and don't specify a connection group, the default one will be associated with your distribution tenant.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.connection_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>connection_groups</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.cloudfront.connection_groups_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>connection_groups_list_only</code> resource, see <a href="/services/cloudfront/connection_groups/#permissions"><code>connection_groups</code></a>
-
diff --git a/website/docs/services/cloudfront/continuous_deployment_policies/index.md b/website/docs/services/cloudfront/continuous_deployment_policies/index.md
index 7db924078..e5ce2618f 100644
--- a/website/docs/services/cloudfront/continuous_deployment_policies/index.md
+++ b/website/docs/services/cloudfront/continuous_deployment_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>continuous_deployment_policy</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "continuous_deployment_policy_config",
@@ -164,6 +173,23 @@ Creates, updates, deletes or gets a <code>continuous_deployment_policy</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-continuousdeploymentpolicy.html"><code>AWS::CloudFront::ContinuousDeploymentPolicy</code></a>.
 
@@ -173,31 +199,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>continuous_deployment_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ContinuousDeploymentPolicyConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>continuous_deployment_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>continuous_deployment_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>continuous_deployment_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>continuous_deployment_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -206,6 +238,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>continuous_deployment_policy</code>.
 ```sql
 SELECT
@@ -216,6 +257,19 @@ last_modified_time
 FROM awscc.cloudfront.continuous_deployment_policies
 WHERE data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>continuous_deployment_policies</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.cloudfront.continuous_deployment_policies_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -296,6 +350,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudfront.continuous_deployment_policies
+SET data__PatchDocument = string('{{ {
+    "ContinuousDeploymentPolicyConfig": continuous_deployment_policy_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/continuous_deployment_policies_list_only/index.md b/website/docs/services/cloudfront/continuous_deployment_policies_list_only/index.md
deleted file mode 100644
index dc7d4a9a5..000000000
--- a/website/docs/services/cloudfront/continuous_deployment_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: continuous_deployment_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - continuous_deployment_policies_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>continuous_deployment_policies</code> in a region or regions, for all properties use <a href="/services/cloudfront/continuous_deployment_policies/"><code>continuous_deployment_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>continuous_deployment_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a continuous deployment policy that routes a subset of production traffic from a primary distribution to a staging distribution.<br />After you create and update a staging distribution, you can use a continuous deployment policy to incrementally move traffic to the staging distribution. This enables you to test changes to a distribution's configuration before moving all of your production traffic to the new configuration.<br />For more information, see &#91;Using CloudFront continuous deployment to safely test CDN configuration changes&#93;(https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/continuous-deployment.html) in the &#42;Amazon CloudFront Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.continuous_deployment_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>continuous_deployment_policies</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.cloudfront.continuous_deployment_policies_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>continuous_deployment_policies_list_only</code> resource, see <a href="/services/cloudfront/continuous_deployment_policies/#permissions"><code>continuous_deployment_policies</code></a>
-
diff --git a/website/docs/services/cloudfront/distribution_tenants/index.md b/website/docs/services/cloudfront/distribution_tenants/index.md
index 48b3d337b..05ada41d9 100644
--- a/website/docs/services/cloudfront/distribution_tenants/index.md
+++ b/website/docs/services/cloudfront/distribution_tenants/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>distribution_tenant</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -221,6 +230,23 @@ Creates, updates, deletes or gets a <code>distribution_tenant</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-distributiontenant.html"><code>AWS::CloudFront::DistributionTenant</code></a>.
 
@@ -230,31 +256,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>distribution_tenants</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DistributionId, Name, Domains, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>distribution_tenants</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>distribution_tenants</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>distribution_tenants_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>distribution_tenants</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -263,6 +295,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>distribution_tenant</code>.
 ```sql
 SELECT
@@ -286,6 +327,19 @@ managed_certificate_request
 FROM awscc.cloudfront.distribution_tenants
 WHERE data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>distribution_tenants</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.cloudfront.distribution_tenants_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -399,6 +453,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudfront.distribution_tenants
+SET data__PatchDocument = string('{{ {
+    "DistributionId": distribution_id,
+    "Tags": tags,
+    "Customizations": customizations,
+    "Parameters": parameters,
+    "ConnectionGroupId": connection_group_id,
+    "Enabled": enabled,
+    "Domains": domains,
+    "ManagedCertificateRequest": managed_certificate_request
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/distribution_tenants_list_only/index.md b/website/docs/services/cloudfront/distribution_tenants_list_only/index.md
deleted file mode 100644
index f95a351ff..000000000
--- a/website/docs/services/cloudfront/distribution_tenants_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: distribution_tenants_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - distribution_tenants_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>distribution_tenants</code> in a region or regions, for all properties use <a href="/services/cloudfront/distribution_tenants/"><code>distribution_tenants</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>distribution_tenants_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The distribution tenant.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.distribution_tenants_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>distribution_tenants</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.cloudfront.distribution_tenants_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>distribution_tenants_list_only</code> resource, see <a href="/services/cloudfront/distribution_tenants/#permissions"><code>distribution_tenants</code></a>
-
diff --git a/website/docs/services/cloudfront/distributions/index.md b/website/docs/services/cloudfront/distributions/index.md
index 836ed4e26..b0f9d6e0d 100644
--- a/website/docs/services/cloudfront/distributions/index.md
+++ b/website/docs/services/cloudfront/distributions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>distribution</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "distribution_config",
@@ -848,6 +857,23 @@ Creates, updates, deletes or gets a <code>distribution</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-distribution.html"><code>AWS::CloudFront::Distribution</code></a>.
 
@@ -857,31 +883,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>distributions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DistributionConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>distributions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>distributions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>distributions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>distributions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -890,6 +922,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>distribution</code>.
 ```sql
 SELECT
@@ -901,6 +942,19 @@ tags
 FROM awscc.cloudfront.distributions
 WHERE data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>distributions</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.cloudfront.distributions_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1132,6 +1186,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudfront.distributions
+SET data__PatchDocument = string('{{ {
+    "DistributionConfig": distribution_config,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/distributions_list_only/index.md b/website/docs/services/cloudfront/distributions_list_only/index.md
deleted file mode 100644
index 6875cc046..000000000
--- a/website/docs/services/cloudfront/distributions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: distributions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - distributions_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>distributions</code> in a region or regions, for all properties use <a href="/services/cloudfront/distributions/"><code>distributions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>distributions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A distribution tells CloudFront where you want content to be delivered from, and the details about how to track and manage content delivery.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.distributions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>distributions</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.cloudfront.distributions_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>distributions_list_only</code> resource, see <a href="/services/cloudfront/distributions/#permissions"><code>distributions</code></a>
-
diff --git a/website/docs/services/cloudfront/functions/index.md b/website/docs/services/cloudfront/functions/index.md
index ad1fa13fb..c0b71bee6 100644
--- a/website/docs/services/cloudfront/functions/index.md
+++ b/website/docs/services/cloudfront/functions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>function</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "auto_publish",
@@ -106,6 +115,23 @@ Creates, updates, deletes or gets a <code>function</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "function_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-function.html"><code>AWS::CloudFront::Function</code></a>.
 
@@ -115,31 +141,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>functions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, FunctionConfig, FunctionCode, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>functions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>functions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>functions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>functions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -148,6 +180,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>function</code>.
 ```sql
 SELECT
@@ -162,6 +203,19 @@ stage
 FROM awscc.cloudfront.functions
 WHERE data__Identifier = '<FunctionARN>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>functions</code> in a region.
+```sql
+SELECT
+region,
+function_arn
+FROM awscc.cloudfront.functions_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -247,6 +301,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudfront.functions
+SET data__PatchDocument = string('{{ {
+    "AutoPublish": auto_publish,
+    "FunctionCode": function_code,
+    "FunctionConfig": function_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FunctionARN>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/functions_list_only/index.md b/website/docs/services/cloudfront/functions_list_only/index.md
deleted file mode 100644
index 7217733d1..000000000
--- a/website/docs/services/cloudfront/functions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: functions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - functions_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>functions</code> in a region or regions, for all properties use <a href="/services/cloudfront/functions/"><code>functions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>functions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a CF function.<br />To create a function, you provide the function code and some configuration information about the function. The response contains an Amazon Resource Name (ARN) that uniquely identifies the function, and the function’s stage.<br />By default, when you create a function, it’s in the &#96;&#96;DEVELOPMENT&#96;&#96; stage. In this stage, you can &#91;test the function&#93;(https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/test-function.html) in the CF console (or with &#96;&#96;TestFunction&#96;&#96; in the CF API).<br />When you’re ready to use your function with a CF distribution, publish the function to the &#96;&#96;LIVE&#96;&#96; stage. You can do this in the CF console, with &#96;&#96;PublishFunction&#96;&#96; in the CF API, or by updating the &#96;&#96;AWS::CloudFront::Function&#96;&#96; resource with the &#96;&#96;AutoPublish&#96;&#96; property set to &#96;&#96;true&#96;&#96;. When the function is published to the &#96;&#96;LIVE&#96;&#96; stage, you can attach it to a distribution’s cache behavior, using the function’s ARN.<br />To automatically publish the function to the &#96;&#96;LIVE&#96;&#96; stage when it’s created, set the &#96;&#96;AutoPublish&#96;&#96; property to &#96;&#96;true&#96;&#96;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.functions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "function_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>functions</code> in a region.
-```sql
-SELECT
-region,
-function_arn
-FROM awscc.cloudfront.functions_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>functions_list_only</code> resource, see <a href="/services/cloudfront/functions/#permissions"><code>functions</code></a>
-
diff --git a/website/docs/services/cloudfront/index.md b/website/docs/services/cloudfront/index.md
index e9bda9e83..e10c54047 100644
--- a/website/docs/services/cloudfront/index.md
+++ b/website/docs/services/cloudfront/index.md
@@ -20,7 +20,7 @@ The cloudfront service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>33</b></span><br />
+<span>total resources:&nbsp;<b>17</b></span><br />
 </div>
 </div>
 
@@ -30,39 +30,23 @@ The cloudfront service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/cloudfront/anycast_ip_lists/">anycast_ip_lists</a><br />
-<a href="/services/cloudfront/anycast_ip_lists_list_only/">anycast_ip_lists_list_only</a><br />
 <a href="/services/cloudfront/cache_policies/">cache_policies</a><br />
-<a href="/services/cloudfront/cache_policies_list_only/">cache_policies_list_only</a><br />
 <a href="/services/cloudfront/cloud_front_origin_access_identities/">cloud_front_origin_access_identities</a><br />
-<a href="/services/cloudfront/cloud_front_origin_access_identities_list_only/">cloud_front_origin_access_identities_list_only</a><br />
 <a href="/services/cloudfront/connection_groups/">connection_groups</a><br />
-<a href="/services/cloudfront/connection_groups_list_only/">connection_groups_list_only</a><br />
 <a href="/services/cloudfront/continuous_deployment_policies/">continuous_deployment_policies</a><br />
-<a href="/services/cloudfront/continuous_deployment_policies_list_only/">continuous_deployment_policies_list_only</a><br />
 <a href="/services/cloudfront/distribution_tenants/">distribution_tenants</a><br />
-<a href="/services/cloudfront/distribution_tenants_list_only/">distribution_tenants_list_only</a><br />
 <a href="/services/cloudfront/distributions/">distributions</a><br />
-<a href="/services/cloudfront/distributions_list_only/">distributions_list_only</a><br />
 <a href="/services/cloudfront/functions/">functions</a><br />
-<a href="/services/cloudfront/functions_list_only/">functions_list_only</a><br />
 <a href="/services/cloudfront/key_groups/">key_groups</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/cloudfront/key_groups_list_only/">key_groups_list_only</a><br />
 <a href="/services/cloudfront/key_value_stores/">key_value_stores</a><br />
-<a href="/services/cloudfront/key_value_stores_list_only/">key_value_stores_list_only</a><br />
 <a href="/services/cloudfront/monitoring_subscriptions/">monitoring_subscriptions</a><br />
 <a href="/services/cloudfront/origin_access_controls/">origin_access_controls</a><br />
-<a href="/services/cloudfront/origin_access_controls_list_only/">origin_access_controls_list_only</a><br />
 <a href="/services/cloudfront/origin_request_policies/">origin_request_policies</a><br />
-<a href="/services/cloudfront/origin_request_policies_list_only/">origin_request_policies_list_only</a><br />
 <a href="/services/cloudfront/public_keys/">public_keys</a><br />
-<a href="/services/cloudfront/public_keys_list_only/">public_keys_list_only</a><br />
 <a href="/services/cloudfront/realtime_log_configs/">realtime_log_configs</a><br />
-<a href="/services/cloudfront/realtime_log_configs_list_only/">realtime_log_configs_list_only</a><br />
 <a href="/services/cloudfront/response_headers_policies/">response_headers_policies</a><br />
-<a href="/services/cloudfront/response_headers_policies_list_only/">response_headers_policies_list_only</a><br />
-<a href="/services/cloudfront/vpc_origins/">vpc_origins</a><br />
-<a href="/services/cloudfront/vpc_origins_list_only/">vpc_origins_list_only</a>
+<a href="/services/cloudfront/vpc_origins/">vpc_origins</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/cloudfront/key_groups/index.md b/website/docs/services/cloudfront/key_groups/index.md
index 2a8ab9b5e..f34508851 100644
--- a/website/docs/services/cloudfront/key_groups/index.md
+++ b/website/docs/services/cloudfront/key_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>key_group</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>key_group</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-keygroup.html"><code>AWS::CloudFront::KeyGroup</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>key_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="KeyGroupConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>key_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>key_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>key_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>key_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>key_group</code>.
 ```sql
 SELECT
@@ -124,6 +165,19 @@ last_modified_time
 FROM awscc.cloudfront.key_groups
 WHERE data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>key_groups</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.cloudfront.key_groups_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -188,6 +242,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudfront.key_groups
+SET data__PatchDocument = string('{{ {
+    "KeyGroupConfig": key_group_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/key_groups_list_only/index.md b/website/docs/services/cloudfront/key_groups_list_only/index.md
deleted file mode 100644
index ef38b303f..000000000
--- a/website/docs/services/cloudfront/key_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: key_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - key_groups_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>key_groups</code> in a region or regions, for all properties use <a href="/services/cloudfront/key_groups/"><code>key_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>key_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A key group.<br />A key group contains a list of public keys that you can use with &#91;CloudFront signed URLs and signed cookies&#93;(https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/PrivateContent.html).</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.key_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>key_groups</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.cloudfront.key_groups_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>key_groups_list_only</code> resource, see <a href="/services/cloudfront/key_groups/#permissions"><code>key_groups</code></a>
-
diff --git a/website/docs/services/cloudfront/key_value_stores/index.md b/website/docs/services/cloudfront/key_value_stores/index.md
index 8a2900211..1edaf58e9 100644
--- a/website/docs/services/cloudfront/key_value_stores/index.md
+++ b/website/docs/services/cloudfront/key_value_stores/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>key_value_store</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>key_value_store</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the key value store."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-keyvaluestore.html"><code>AWS::CloudFront::KeyValueStore</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>key_value_stores</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>key_value_stores</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>key_value_stores</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>key_value_stores_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>key_value_stores</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>key_value_store</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ import_source
 FROM awscc.cloudfront.key_value_stores
 WHERE data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>key_value_stores</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.cloudfront.key_value_stores_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -207,6 +261,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudfront.key_value_stores
+SET data__PatchDocument = string('{{ {
+    "Comment": comment,
+    "ImportSource": import_source
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/key_value_stores_list_only/index.md b/website/docs/services/cloudfront/key_value_stores_list_only/index.md
deleted file mode 100644
index 5675d9446..000000000
--- a/website/docs/services/cloudfront/key_value_stores_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: key_value_stores_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - key_value_stores_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>key_value_stores</code> in a region or regions, for all properties use <a href="/services/cloudfront/key_value_stores/"><code>key_value_stores</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>key_value_stores_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The key value store. Use this to separate data from function code, allowing you to update data without having to publish a new version of a function. The key value store holds keys and their corresponding values.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.key_value_stores_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the key value store."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>key_value_stores</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.cloudfront.key_value_stores_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>key_value_stores_list_only</code> resource, see <a href="/services/cloudfront/key_value_stores/#permissions"><code>key_value_stores</code></a>
-
diff --git a/website/docs/services/cloudfront/monitoring_subscriptions/index.md b/website/docs/services/cloudfront/monitoring_subscriptions/index.md
index 0ded0fbab..0c654a041 100644
--- a/website/docs/services/cloudfront/monitoring_subscriptions/index.md
+++ b/website/docs/services/cloudfront/monitoring_subscriptions/index.md
@@ -166,6 +166,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/origin_access_controls/index.md b/website/docs/services/cloudfront/origin_access_controls/index.md
index 1ef505c81..a72bf00cf 100644
--- a/website/docs/services/cloudfront/origin_access_controls/index.md
+++ b/website/docs/services/cloudfront/origin_access_controls/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>origin_access_control</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets an <code>origin_access_control</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-originaccesscontrol.html"><code>AWS::CloudFront::OriginAccessControl</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>origin_access_controls</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="OriginAccessControlConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>origin_access_controls</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>origin_access_controls</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>origin_access_controls_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>origin_access_controls</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>origin_access_control</code>.
 ```sql
 SELECT
@@ -128,6 +169,19 @@ origin_access_control_config
 FROM awscc.cloudfront.origin_access_controls
 WHERE data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>origin_access_controls</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.cloudfront.origin_access_controls_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -193,6 +247,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudfront.origin_access_controls
+SET data__PatchDocument = string('{{ {
+    "OriginAccessControlConfig": origin_access_control_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/origin_access_controls_list_only/index.md b/website/docs/services/cloudfront/origin_access_controls_list_only/index.md
deleted file mode 100644
index c3ee9886e..000000000
--- a/website/docs/services/cloudfront/origin_access_controls_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: origin_access_controls_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - origin_access_controls_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>origin_access_controls</code> in a region or regions, for all properties use <a href="/services/cloudfront/origin_access_controls/"><code>origin_access_controls</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>origin_access_controls_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a new origin access control in CloudFront. After you create an origin access control, you can add it to an origin in a CloudFront distribution so that CloudFront sends authenticated (signed) requests to the origin.<br />This makes it possible to block public access to the origin, allowing viewers (users) to access the origin's content only through CloudFront.<br />For more information about using a CloudFront origin access control, see &#91;Restricting access to an origin&#93;(https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/private-content-restricting-access-to-origin.html) in the &#42;Amazon CloudFront Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.origin_access_controls_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>origin_access_controls</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.cloudfront.origin_access_controls_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>origin_access_controls_list_only</code> resource, see <a href="/services/cloudfront/origin_access_controls/#permissions"><code>origin_access_controls</code></a>
-
diff --git a/website/docs/services/cloudfront/origin_request_policies/index.md b/website/docs/services/cloudfront/origin_request_policies/index.md
index f58f13d6e..cdf61dd4d 100644
--- a/website/docs/services/cloudfront/origin_request_policies/index.md
+++ b/website/docs/services/cloudfront/origin_request_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>origin_request_policy</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -118,6 +127,23 @@ Creates, updates, deletes or gets an <code>origin_request_policy</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-originrequestpolicy.html"><code>AWS::CloudFront::OriginRequestPolicy</code></a>.
 
@@ -127,31 +153,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>origin_request_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="OriginRequestPolicyConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>origin_request_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>origin_request_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>origin_request_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>origin_request_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -160,6 +192,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>origin_request_policy</code>.
 ```sql
 SELECT
@@ -170,6 +211,19 @@ origin_request_policy_config
 FROM awscc.cloudfront.origin_request_policies
 WHERE data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>origin_request_policies</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.cloudfront.origin_request_policies_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -244,6 +298,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudfront.origin_request_policies
+SET data__PatchDocument = string('{{ {
+    "OriginRequestPolicyConfig": origin_request_policy_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/origin_request_policies_list_only/index.md b/website/docs/services/cloudfront/origin_request_policies_list_only/index.md
deleted file mode 100644
index 8b3ea3e31..000000000
--- a/website/docs/services/cloudfront/origin_request_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: origin_request_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - origin_request_policies_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>origin_request_policies</code> in a region or regions, for all properties use <a href="/services/cloudfront/origin_request_policies/"><code>origin_request_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>origin_request_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An origin request policy.<br />When it's attached to a cache behavior, the origin request policy determines the values that CloudFront includes in requests that it sends to the origin. Each request that CloudFront sends to the origin includes the following:<br />+ The request body and the URL path (without the domain name) from the viewer request.<br />+ The headers that CloudFront automatically includes in every origin request, including &#96;&#96;Host&#96;&#96;, &#96;&#96;User-Agent&#96;&#96;, and &#96;&#96;X-Amz-Cf-Id&#96;&#96;.<br />+ All HTTP headers, cookies, and URL query strings that are specified in the cache policy or the origin request policy. These can include items from the viewer request and, in the case of headers, additional ones that are added by CloudFront.<br /><br />CloudFront sends a request when it can't find an object in its cache that matches the request. If you want to send values to the origin and also include them in the cache key, use &#96;&#96;CachePolicy&#96;&#96;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.origin_request_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>origin_request_policies</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.cloudfront.origin_request_policies_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>origin_request_policies_list_only</code> resource, see <a href="/services/cloudfront/origin_request_policies/#permissions"><code>origin_request_policies</code></a>
-
diff --git a/website/docs/services/cloudfront/public_keys/index.md b/website/docs/services/cloudfront/public_keys/index.md
index 9e6479169..0992578bf 100644
--- a/website/docs/services/cloudfront/public_keys/index.md
+++ b/website/docs/services/cloudfront/public_keys/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>public_key</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "created_time",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>public_key</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-publickey.html"><code>AWS::CloudFront::PublicKey</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>public_keys</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PublicKeyConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>public_keys</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>public_keys</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>public_keys_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>public_keys</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>public_key</code>.
 ```sql
 SELECT
@@ -129,6 +170,19 @@ public_key_config
 FROM awscc.cloudfront.public_keys
 WHERE data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>public_keys</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.cloudfront.public_keys_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -193,6 +247,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudfront.public_keys
+SET data__PatchDocument = string('{{ {
+    "PublicKeyConfig": public_key_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/public_keys_list_only/index.md b/website/docs/services/cloudfront/public_keys_list_only/index.md
deleted file mode 100644
index 1bfba3fe7..000000000
--- a/website/docs/services/cloudfront/public_keys_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: public_keys_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - public_keys_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>public_keys</code> in a region or regions, for all properties use <a href="/services/cloudfront/public_keys/"><code>public_keys</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>public_keys_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A public key that you can use with &#91;signed URLs and signed cookies&#93;(https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/PrivateContent.html), or with &#91;field-level encryption&#93;(https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/field-level-encryption.html).</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.public_keys_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>public_keys</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.cloudfront.public_keys_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>public_keys_list_only</code> resource, see <a href="/services/cloudfront/public_keys/#permissions"><code>public_keys</code></a>
-
diff --git a/website/docs/services/cloudfront/realtime_log_configs/index.md b/website/docs/services/cloudfront/realtime_log_configs/index.md
index b542315ff..c82c57648 100644
--- a/website/docs/services/cloudfront/realtime_log_configs/index.md
+++ b/website/docs/services/cloudfront/realtime_log_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>realtime_log_config</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -89,6 +98,23 @@ Creates, updates, deletes or gets a <code>realtime_log_config</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-realtimelogconfig.html"><code>AWS::CloudFront::RealtimeLogConfig</code></a>.
 
@@ -98,31 +124,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>realtime_log_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, EndPoints, Fields, SamplingRate, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>realtime_log_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>realtime_log_configs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>realtime_log_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>realtime_log_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -131,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>realtime_log_config</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ sampling_rate
 FROM awscc.cloudfront.realtime_log_configs
 WHERE data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>realtime_log_configs</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.cloudfront.realtime_log_configs_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -226,6 +280,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudfront.realtime_log_configs
+SET data__PatchDocument = string('{{ {
+    "EndPoints": end_points,
+    "Fields": fields,
+    "SamplingRate": sampling_rate
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/realtime_log_configs_list_only/index.md b/website/docs/services/cloudfront/realtime_log_configs_list_only/index.md
deleted file mode 100644
index 9c20b22ba..000000000
--- a/website/docs/services/cloudfront/realtime_log_configs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: realtime_log_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - realtime_log_configs_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>realtime_log_configs</code> in a region or regions, for all properties use <a href="/services/cloudfront/realtime_log_configs/"><code>realtime_log_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>realtime_log_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A real-time log configuration.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.realtime_log_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>realtime_log_configs</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.cloudfront.realtime_log_configs_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>realtime_log_configs_list_only</code> resource, see <a href="/services/cloudfront/realtime_log_configs/#permissions"><code>realtime_log_configs</code></a>
-
diff --git a/website/docs/services/cloudfront/response_headers_policies/index.md b/website/docs/services/cloudfront/response_headers_policies/index.md
index 58b077940..c837d53df 100644
--- a/website/docs/services/cloudfront/response_headers_policies/index.md
+++ b/website/docs/services/cloudfront/response_headers_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>response_headers_policy</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -326,6 +335,23 @@ Creates, updates, deletes or gets a <code>response_headers_policy</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-responseheaderspolicy.html"><code>AWS::CloudFront::ResponseHeadersPolicy</code></a>.
 
@@ -335,31 +361,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>response_headers_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResponseHeadersPolicyConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>response_headers_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>response_headers_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>response_headers_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>response_headers_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -368,6 +400,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>response_headers_policy</code>.
 ```sql
 SELECT
@@ -378,6 +419,19 @@ response_headers_policy_config
 FROM awscc.cloudfront.response_headers_policies
 WHERE data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>response_headers_policies</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.cloudfront.response_headers_policies_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -489,6 +543,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudfront.response_headers_policies
+SET data__PatchDocument = string('{{ {
+    "ResponseHeadersPolicyConfig": response_headers_policy_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/response_headers_policies_list_only/index.md b/website/docs/services/cloudfront/response_headers_policies_list_only/index.md
deleted file mode 100644
index de77d124f..000000000
--- a/website/docs/services/cloudfront/response_headers_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: response_headers_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - response_headers_policies_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>response_headers_policies</code> in a region or regions, for all properties use <a href="/services/cloudfront/response_headers_policies/"><code>response_headers_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>response_headers_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A response headers policy.<br />A response headers policy contains information about a set of HTTP response headers.<br />After you create a response headers policy, you can use its ID to attach it to one or more cache behaviors in a CloudFront distribution. When it's attached to a cache behavior, the response headers policy affects the HTTP headers that CloudFront includes in HTTP responses to requests that match the cache behavior. CloudFront adds or removes response headers according to the configuration of the response headers policy.<br />For more information, see &#91;Adding or removing HTTP headers in CloudFront responses&#93;(https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/modifying-response-headers.html) in the &#42;Amazon CloudFront Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.response_headers_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>response_headers_policies</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.cloudfront.response_headers_policies_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>response_headers_policies_list_only</code> resource, see <a href="/services/cloudfront/response_headers_policies/#permissions"><code>response_headers_policies</code></a>
-
diff --git a/website/docs/services/cloudfront/vpc_origins/index.md b/website/docs/services/cloudfront/vpc_origins/index.md
index f0627fcd5..778cb3c8b 100644
--- a/website/docs/services/cloudfront/vpc_origins/index.md
+++ b/website/docs/services/cloudfront/vpc_origins/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_origin</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -119,6 +128,23 @@ Creates, updates, deletes or gets a <code>vpc_origin</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-vpcorigin.html"><code>AWS::CloudFront::VpcOrigin</code></a>.
 
@@ -128,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_origins</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VpcOriginEndpointConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_origins</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_origins</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_origins_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_origins</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_origin</code>.
 ```sql
 SELECT
@@ -175,6 +216,19 @@ vpc_origin_endpoint_config
 FROM awscc.cloudfront.vpc_origins
 WHERE data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_origins</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.cloudfront.vpc_origins_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -248,6 +302,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudfront.vpc_origins
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "VpcOriginEndpointConfig": vpc_origin_endpoint_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudfront/vpc_origins_list_only/index.md b/website/docs/services/cloudfront/vpc_origins_list_only/index.md
deleted file mode 100644
index c2578d5bc..000000000
--- a/website/docs/services/cloudfront/vpc_origins_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpc_origins_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_origins_list_only
-  - cloudfront
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_origins</code> in a region or regions, for all properties use <a href="/services/cloudfront/vpc_origins/"><code>vpc_origins</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_origins_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An Amazon CloudFront VPC origin.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudfront.vpc_origins_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_origins</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.cloudfront.vpc_origins_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_origins_list_only</code> resource, see <a href="/services/cloudfront/vpc_origins/#permissions"><code>vpc_origins</code></a>
-
diff --git a/website/docs/services/cloudtrail/channels/index.md b/website/docs/services/cloudtrail/channels/index.md
index 6810c8535..84a69d97f 100644
--- a/website/docs/services/cloudtrail/channels/index.md
+++ b/website/docs/services/cloudtrail/channels/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>channel</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -89,6 +98,23 @@ Creates, updates, deletes or gets a <code>channel</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "channel_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of a channel."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-channel.html"><code>AWS::CloudTrail::Channel</code></a>.
 
@@ -98,31 +124,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>channels_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -131,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>channel</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.cloudtrail.channels
 WHERE region = 'us-east-1' AND data__Identifier = '<ChannelArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>channels</code> in a region.
+```sql
+SELECT
+region,
+channel_arn
+FROM awscc.cloudtrail.channels_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudtrail.channels
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Destinations": destinations,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ChannelArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudtrail/channels_list_only/index.md b/website/docs/services/cloudtrail/channels_list_only/index.md
deleted file mode 100644
index d12f9d5c8..000000000
--- a/website/docs/services/cloudtrail/channels_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: channels_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - channels_list_only
-  - cloudtrail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>channels</code> in a region or regions, for all properties use <a href="/services/cloudtrail/channels/"><code>channels</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>channels_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A channel receives events from a specific source (such as an on-premises storage solution or application, or a partner event data source), and delivers the events to one or more event data stores. You use channels to ingest events into CloudTrail from sources outside AWS.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudtrail.channels_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "channel_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of a channel."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>channels</code> in a region.
-```sql
-SELECT
-region,
-channel_arn
-FROM awscc.cloudtrail.channels_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>channels_list_only</code> resource, see <a href="/services/cloudtrail/channels/#permissions"><code>channels</code></a>
-
diff --git a/website/docs/services/cloudtrail/dashboards/index.md b/website/docs/services/cloudtrail/dashboards/index.md
index c43049e85..75db4f123 100644
--- a/website/docs/services/cloudtrail/dashboards/index.md
+++ b/website/docs/services/cloudtrail/dashboards/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>dashboard</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "widgets",
@@ -143,6 +152,23 @@ Creates, updates, deletes or gets a <code>dashboard</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "dashboard_arn",
+    "type": "string",
+    "description": "The ARN of the dashboard."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-dashboard.html"><code>AWS::CloudTrail::Dashboard</code></a>.
 
@@ -152,31 +178,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>dashboards_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -185,6 +217,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dashboard</code>.
 ```sql
 SELECT
@@ -202,6 +243,19 @@ tags
 FROM awscc.cloudtrail.dashboards
 WHERE region = 'us-east-1' AND data__Identifier = '<DashboardArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>dashboards</code> in a region.
+```sql
+SELECT
+region,
+dashboard_arn
+FROM awscc.cloudtrail.dashboards_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -289,6 +343,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudtrail.dashboards
+SET data__PatchDocument = string('{{ {
+    "Widgets": widgets,
+    "RefreshSchedule": refresh_schedule,
+    "Name": name,
+    "TerminationProtectionEnabled": termination_protection_enabled,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DashboardArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudtrail/dashboards_list_only/index.md b/website/docs/services/cloudtrail/dashboards_list_only/index.md
deleted file mode 100644
index 791e075d3..000000000
--- a/website/docs/services/cloudtrail/dashboards_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: dashboards_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - dashboards_list_only
-  - cloudtrail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>dashboards</code> in a region or regions, for all properties use <a href="/services/cloudtrail/dashboards/"><code>dashboards</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>dashboards_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The Amazon CloudTrail dashboard resource allows customers to manage managed dashboards and create custom dashboards. You can manually refresh custom and managed dashboards. For custom dashboards, you can also set up an automatic refresh schedule and modify dashboard widgets.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudtrail.dashboards_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "dashboard_arn",
-    "type": "string",
-    "description": "The ARN of the dashboard."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>dashboards</code> in a region.
-```sql
-SELECT
-region,
-dashboard_arn
-FROM awscc.cloudtrail.dashboards_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>dashboards_list_only</code> resource, see <a href="/services/cloudtrail/dashboards/#permissions"><code>dashboards</code></a>
-
diff --git a/website/docs/services/cloudtrail/event_data_stores/index.md b/website/docs/services/cloudtrail/event_data_stores/index.md
index d089c13fc..b9a10fc36 100644
--- a/website/docs/services/cloudtrail/event_data_stores/index.md
+++ b/website/docs/services/cloudtrail/event_data_stores/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>event_data_store</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "advanced_event_selectors",
@@ -215,6 +224,23 @@ Creates, updates, deletes or gets an <code>event_data_store</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "event_data_store_arn",
+    "type": "string",
+    "description": "The ARN of the event data store."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-eventdatastore.html"><code>AWS::CloudTrail::EventDataStore</code></a>.
 
@@ -224,31 +250,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>event_data_stores</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>event_data_stores</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>event_data_stores</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>event_data_stores_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>event_data_stores</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -257,6 +289,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>event_data_store</code>.
 ```sql
 SELECT
@@ -284,6 +325,19 @@ ingestion_enabled
 FROM awscc.cloudtrail.event_data_stores
 WHERE region = 'us-east-1' AND data__Identifier = '<EventDataStoreArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>event_data_stores</code> in a region.
+```sql
+SELECT
+region,
+event_data_store_arn
+FROM awscc.cloudtrail.event_data_stores_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -425,6 +479,34 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudtrail.event_data_stores
+SET data__PatchDocument = string('{{ {
+    "AdvancedEventSelectors": advanced_event_selectors,
+    "FederationEnabled": federation_enabled,
+    "FederationRoleArn": federation_role_arn,
+    "MultiRegionEnabled": multi_region_enabled,
+    "Name": name,
+    "OrganizationEnabled": organization_enabled,
+    "BillingMode": billing_mode,
+    "RetentionPeriod": retention_period,
+    "TerminationProtectionEnabled": termination_protection_enabled,
+    "KmsKeyId": kms_key_id,
+    "Tags": tags,
+    "InsightSelectors": insight_selectors,
+    "InsightsDestination": insights_destination,
+    "MaxEventSize": max_event_size,
+    "ContextKeySelectors": context_key_selectors,
+    "IngestionEnabled": ingestion_enabled
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<EventDataStoreArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudtrail/event_data_stores_list_only/index.md b/website/docs/services/cloudtrail/event_data_stores_list_only/index.md
deleted file mode 100644
index c4189e1f2..000000000
--- a/website/docs/services/cloudtrail/event_data_stores_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: event_data_stores_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - event_data_stores_list_only
-  - cloudtrail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>event_data_stores</code> in a region or regions, for all properties use <a href="/services/cloudtrail/event_data_stores/"><code>event_data_stores</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>event_data_stores_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A storage lake of event data against which you can run complex SQL-based queries. An event data store can include events that you have logged on your account from the last 7 to 2557 or 3653 days (about seven or ten years) depending on the selected BillingMode.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudtrail.event_data_stores_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "event_data_store_arn",
-    "type": "string",
-    "description": "The ARN of the event data store."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>event_data_stores</code> in a region.
-```sql
-SELECT
-region,
-event_data_store_arn
-FROM awscc.cloudtrail.event_data_stores_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>event_data_stores_list_only</code> resource, see <a href="/services/cloudtrail/event_data_stores/#permissions"><code>event_data_stores</code></a>
-
diff --git a/website/docs/services/cloudtrail/index.md b/website/docs/services/cloudtrail/index.md
index 76cfa32d8..8446ae187 100644
--- a/website/docs/services/cloudtrail/index.md
+++ b/website/docs/services/cloudtrail/index.md
@@ -20,7 +20,7 @@ The cloudtrail service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>9</b></span><br />
+<span>total resources:&nbsp;<b>5</b></span><br />
 </div>
 </div>
 
@@ -30,15 +30,11 @@ The cloudtrail service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/cloudtrail/channels/">channels</a><br />
-<a href="/services/cloudtrail/channels_list_only/">channels_list_only</a><br />
 <a href="/services/cloudtrail/dashboards/">dashboards</a><br />
-<a href="/services/cloudtrail/dashboards_list_only/">dashboards_list_only</a><br />
 <a href="/services/cloudtrail/event_data_stores/">event_data_stores</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/cloudtrail/event_data_stores_list_only/">event_data_stores_list_only</a><br />
 <a href="/services/cloudtrail/resource_policies/">resource_policies</a><br />
-<a href="/services/cloudtrail/trails/">trails</a><br />
-<a href="/services/cloudtrail/trails_list_only/">trails_list_only</a>
+<a href="/services/cloudtrail/trails/">trails</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/cloudtrail/resource_policies/index.md b/website/docs/services/cloudtrail/resource_policies/index.md
index f7ddcfcdf..bd67b04a0 100644
--- a/website/docs/services/cloudtrail/resource_policies/index.md
+++ b/website/docs/services/cloudtrail/resource_policies/index.md
@@ -162,6 +162,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudtrail.resource_policies
+SET data__PatchDocument = string('{{ {
+    "ResourcePolicy": resource_policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ResourceArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudtrail/trails/index.md b/website/docs/services/cloudtrail/trails/index.md
index e0e3847a8..b40a72a75 100644
--- a/website/docs/services/cloudtrail/trails/index.md
+++ b/website/docs/services/cloudtrail/trails/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>trail</code> resource or lists <code>t
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "include_global_service_events",
@@ -232,6 +241,23 @@ Creates, updates, deletes or gets a <code>trail</code> resource or lists <code>t
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "trail_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html"><code>AWS::CloudTrail::Trail</code></a>.
 
@@ -241,31 +267,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>trails</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="S3BucketName, IsLogging, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>trails</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>trails</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>trails_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>trails</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -274,6 +306,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>trail</code>.
 ```sql
 SELECT
@@ -299,6 +340,19 @@ is_logging
 FROM awscc.cloudtrail.trails
 WHERE region = 'us-east-1' AND data__Identifier = '<TrailName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>trails</code> in a region.
+```sql
+SELECT
+region,
+trail_name
+FROM awscc.cloudtrail.trails_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -447,6 +501,33 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudtrail.trails
+SET data__PatchDocument = string('{{ {
+    "IncludeGlobalServiceEvents": include_global_service_events,
+    "EventSelectors": event_selectors,
+    "KMSKeyId": kms_key_id,
+    "CloudWatchLogsRoleArn": cloud_watch_logs_role_arn,
+    "S3KeyPrefix": s3_key_prefix,
+    "AdvancedEventSelectors": advanced_event_selectors,
+    "IsOrganizationTrail": is_organization_trail,
+    "InsightSelectors": insight_selectors,
+    "CloudWatchLogsLogGroupArn": cloud_watch_logs_log_group_arn,
+    "SnsTopicName": sns_topic_name,
+    "IsMultiRegionTrail": is_multi_region_trail,
+    "S3BucketName": s3_bucket_name,
+    "EnableLogFileValidation": enable_log_file_validation,
+    "Tags": tags,
+    "IsLogging": is_logging
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TrailName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudtrail/trails_list_only/index.md b/website/docs/services/cloudtrail/trails_list_only/index.md
deleted file mode 100644
index 05df470d2..000000000
--- a/website/docs/services/cloudtrail/trails_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: trails_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - trails_list_only
-  - cloudtrail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>trails</code> in a region or regions, for all properties use <a href="/services/cloudtrail/trails/"><code>trails</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>trails_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a trail that specifies the settings for delivery of log data to an Amazon S3 bucket. A maximum of five trails can exist in a region, irrespective of the region in which they were created.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudtrail.trails_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "trail_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>trails</code> in a region.
-```sql
-SELECT
-region,
-trail_name
-FROM awscc.cloudtrail.trails_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>trails_list_only</code> resource, see <a href="/services/cloudtrail/trails/#permissions"><code>trails</code></a>
-
diff --git a/website/docs/services/cloudwatch/alarms/index.md b/website/docs/services/cloudwatch/alarms/index.md
index c85aee04b..648d9b4fb 100644
--- a/website/docs/services/cloudwatch/alarms/index.md
+++ b/website/docs/services/cloudwatch/alarms/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>alarm</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "threshold_metric_id",
@@ -255,6 +264,23 @@ Creates, updates, deletes or gets an <code>alarm</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "alarm_name",
+    "type": "string",
+    "description": "The name of the alarm. If you don't specify a name, CFN generates a unique physical ID and uses that ID for the alarm name. <br />If you specify a name, you cannot perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-alarm.html"><code>AWS::CloudWatch::Alarm</code></a>.
 
@@ -264,31 +290,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>alarms</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ComparisonOperator, EvaluationPeriods, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>alarms</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>alarms</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>alarms_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>alarms</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -297,6 +329,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>alarm</code>.
 ```sql
 SELECT
@@ -327,6 +368,19 @@ tags
 FROM awscc.cloudwatch.alarms
 WHERE region = 'us-east-1' AND data__Identifier = '<AlarmName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>alarms</code> in a region.
+```sql
+SELECT
+region,
+alarm_name
+FROM awscc.cloudwatch.alarms_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -495,6 +549,39 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudwatch.alarms
+SET data__PatchDocument = string('{{ {
+    "ThresholdMetricId": threshold_metric_id,
+    "EvaluateLowSampleCountPercentile": evaluate_low_sample_count_percentile,
+    "ExtendedStatistic": extended_statistic,
+    "ComparisonOperator": comparison_operator,
+    "TreatMissingData": treat_missing_data,
+    "Dimensions": dimensions,
+    "Period": period,
+    "EvaluationPeriods": evaluation_periods,
+    "Unit": unit,
+    "Namespace": namespace,
+    "OKActions": ok_actions,
+    "AlarmActions": alarm_actions,
+    "MetricName": metric_name,
+    "ActionsEnabled": actions_enabled,
+    "Metrics": metrics,
+    "AlarmDescription": alarm_description,
+    "Statistic": statistic,
+    "InsufficientDataActions": insufficient_data_actions,
+    "DatapointsToAlarm": datapoints_to_alarm,
+    "Threshold": threshold,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AlarmName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudwatch/alarms_list_only/index.md b/website/docs/services/cloudwatch/alarms_list_only/index.md
deleted file mode 100644
index 565515e9c..000000000
--- a/website/docs/services/cloudwatch/alarms_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: alarms_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - alarms_list_only
-  - cloudwatch
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>alarms</code> in a region or regions, for all properties use <a href="/services/cloudwatch/alarms/"><code>alarms</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>alarms_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::CloudWatch::Alarm&#96;&#96; type specifies an alarm and associates it with the specified metric or metric math expression.<br />When this operation creates an alarm, the alarm state is immediately set to &#96;&#96;INSUFFICIENT&#95;DATA&#96;&#96;. The alarm is then evaluated and its state is set appropriately. Any actions associated with the new state are then executed.<br />When you update an existing alarm, its state is left unchanged, but the update completely overwrites the previous configuration of the alarm.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudwatch.alarms_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "alarm_name",
-    "type": "string",
-    "description": "The name of the alarm. If you don't specify a name, CFN generates a unique physical ID and uses that ID for the alarm name. <br />If you specify a name, you cannot perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>alarms</code> in a region.
-```sql
-SELECT
-region,
-alarm_name
-FROM awscc.cloudwatch.alarms_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>alarms_list_only</code> resource, see <a href="/services/cloudwatch/alarms/#permissions"><code>alarms</code></a>
-
diff --git a/website/docs/services/cloudwatch/composite_alarms/index.md b/website/docs/services/cloudwatch/composite_alarms/index.md
index fdd98947e..e435de165 100644
--- a/website/docs/services/cloudwatch/composite_alarms/index.md
+++ b/website/docs/services/cloudwatch/composite_alarms/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>composite_alarm</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -112,6 +121,23 @@ Creates, updates, deletes or gets a <code>composite_alarm</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "alarm_name",
+    "type": "string",
+    "description": "The name of the Composite Alarm"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-compositealarm.html"><code>AWS::CloudWatch::CompositeAlarm</code></a>.
 
@@ -121,31 +147,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>composite_alarms</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AlarmRule, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>composite_alarms</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>composite_alarms</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>composite_alarms_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>composite_alarms</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -154,6 +186,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>composite_alarm</code>.
 ```sql
 SELECT
@@ -173,6 +214,19 @@ tags
 FROM awscc.cloudwatch.composite_alarms
 WHERE region = 'us-east-1' AND data__Identifier = '<AlarmName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>composite_alarms</code> in a region.
+```sql
+SELECT
+region,
+alarm_name
+FROM awscc.cloudwatch.composite_alarms_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -278,6 +332,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudwatch.composite_alarms
+SET data__PatchDocument = string('{{ {
+    "AlarmRule": alarm_rule,
+    "AlarmDescription": alarm_description,
+    "ActionsEnabled": actions_enabled,
+    "OKActions": ok_actions,
+    "AlarmActions": alarm_actions,
+    "InsufficientDataActions": insufficient_data_actions,
+    "ActionsSuppressor": actions_suppressor,
+    "ActionsSuppressorWaitPeriod": actions_suppressor_wait_period,
+    "ActionsSuppressorExtensionPeriod": actions_suppressor_extension_period,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AlarmName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudwatch/composite_alarms_list_only/index.md b/website/docs/services/cloudwatch/composite_alarms_list_only/index.md
deleted file mode 100644
index c1e46d58f..000000000
--- a/website/docs/services/cloudwatch/composite_alarms_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: composite_alarms_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - composite_alarms_list_only
-  - cloudwatch
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>composite_alarms</code> in a region or regions, for all properties use <a href="/services/cloudwatch/composite_alarms/"><code>composite_alarms</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>composite_alarms_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::CloudWatch::CompositeAlarm type specifies an alarm which aggregates the states of other Alarms (Metric or Composite Alarms) as defined by the AlarmRule expression</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudwatch.composite_alarms_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "alarm_name",
-    "type": "string",
-    "description": "The name of the Composite Alarm"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>composite_alarms</code> in a region.
-```sql
-SELECT
-region,
-alarm_name
-FROM awscc.cloudwatch.composite_alarms_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>composite_alarms_list_only</code> resource, see <a href="/services/cloudwatch/composite_alarms/#permissions"><code>composite_alarms</code></a>
-
diff --git a/website/docs/services/cloudwatch/dashboards/index.md b/website/docs/services/cloudwatch/dashboards/index.md
index 0dc1e03b0..c517b8fe2 100644
--- a/website/docs/services/cloudwatch/dashboards/index.md
+++ b/website/docs/services/cloudwatch/dashboards/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>dashboard</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "dashboard_name",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>dashboard</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "dashboard_name",
+    "type": "string",
+    "description": "The name of the dashboard. The name must be between 1 and 255 characters. If you do not specify a name, one will be generated automatically."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-dashboard.html"><code>AWS::CloudWatch::Dashboard</code></a>.
 
@@ -59,31 +85,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DashboardBody, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>dashboards_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +124,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dashboard</code>.
 ```sql
 SELECT
@@ -101,6 +142,19 @@ dashboard_body
 FROM awscc.cloudwatch.dashboards
 WHERE region = 'us-east-1' AND data__Identifier = '<DashboardName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>dashboards</code> in a region.
+```sql
+SELECT
+region,
+dashboard_name
+FROM awscc.cloudwatch.dashboards_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -165,6 +219,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudwatch.dashboards
+SET data__PatchDocument = string('{{ {
+    "DashboardBody": dashboard_body
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DashboardName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudwatch/dashboards_list_only/index.md b/website/docs/services/cloudwatch/dashboards_list_only/index.md
deleted file mode 100644
index 14c578b72..000000000
--- a/website/docs/services/cloudwatch/dashboards_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: dashboards_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - dashboards_list_only
-  - cloudwatch
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>dashboards</code> in a region or regions, for all properties use <a href="/services/cloudwatch/dashboards/"><code>dashboards</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>dashboards_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::CloudWatch::Dashboard</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudwatch.dashboards_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "dashboard_name",
-    "type": "string",
-    "description": "The name of the dashboard. The name must be between 1 and 255 characters. If you do not specify a name, one will be generated automatically."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>dashboards</code> in a region.
-```sql
-SELECT
-region,
-dashboard_name
-FROM awscc.cloudwatch.dashboards_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>dashboards_list_only</code> resource, see <a href="/services/cloudwatch/dashboards/#permissions"><code>dashboards</code></a>
-
diff --git a/website/docs/services/cloudwatch/index.md b/website/docs/services/cloudwatch/index.md
index cf51ec8ed..7c4f1738d 100644
--- a/website/docs/services/cloudwatch/index.md
+++ b/website/docs/services/cloudwatch/index.md
@@ -20,7 +20,7 @@ The cloudwatch service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The cloudwatch service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/cloudwatch/alarms/">alarms</a><br />
-<a href="/services/cloudwatch/alarms_list_only/">alarms_list_only</a><br />
-<a href="/services/cloudwatch/composite_alarms/">composite_alarms</a><br />
-<a href="/services/cloudwatch/composite_alarms_list_only/">composite_alarms_list_only</a>
+<a href="/services/cloudwatch/composite_alarms/">composite_alarms</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/cloudwatch/dashboards/">dashboards</a><br />
-<a href="/services/cloudwatch/dashboards_list_only/">dashboards_list_only</a><br />
-<a href="/services/cloudwatch/metric_streams/">metric_streams</a><br />
-<a href="/services/cloudwatch/metric_streams_list_only/">metric_streams_list_only</a>
+<a href="/services/cloudwatch/metric_streams/">metric_streams</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/cloudwatch/metric_streams/index.md b/website/docs/services/cloudwatch/metric_streams/index.md
index 1694d4b94..57594051a 100644
--- a/website/docs/services/cloudwatch/metric_streams/index.md
+++ b/website/docs/services/cloudwatch/metric_streams/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>metric_stream</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -153,6 +162,23 @@ Creates, updates, deletes or gets a <code>metric_stream</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Name of the metric stream."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-metricstream.html"><code>AWS::CloudWatch::MetricStream</code></a>.
 
@@ -162,31 +188,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>metric_streams</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>metric_streams</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>metric_streams</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>metric_streams_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>metric_streams</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -195,6 +227,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>metric_stream</code>.
 ```sql
 SELECT
@@ -215,6 +256,19 @@ include_linked_accounts_metrics
 FROM awscc.cloudwatch.metric_streams
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>metric_streams</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.cloudwatch.metric_streams_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -334,6 +388,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cloudwatch.metric_streams
+SET data__PatchDocument = string('{{ {
+    "ExcludeFilters": exclude_filters,
+    "FirehoseArn": firehose_arn,
+    "IncludeFilters": include_filters,
+    "RoleArn": role_arn,
+    "OutputFormat": output_format,
+    "StatisticsConfigurations": statistics_configurations,
+    "Tags": tags,
+    "IncludeLinkedAccountsMetrics": include_linked_accounts_metrics
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cloudwatch/metric_streams_list_only/index.md b/website/docs/services/cloudwatch/metric_streams_list_only/index.md
deleted file mode 100644
index e19c3510d..000000000
--- a/website/docs/services/cloudwatch/metric_streams_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: metric_streams_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - metric_streams_list_only
-  - cloudwatch
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>metric_streams</code> in a region or regions, for all properties use <a href="/services/cloudwatch/metric_streams/"><code>metric_streams</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>metric_streams_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for Metric Stream</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cloudwatch.metric_streams_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Name of the metric stream."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>metric_streams</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.cloudwatch.metric_streams_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>metric_streams_list_only</code> resource, see <a href="/services/cloudwatch/metric_streams/#permissions"><code>metric_streams</code></a>
-
diff --git a/website/docs/services/codeartifact/domains/index.md b/website/docs/services/codeartifact/domains/index.md
index a26094d16..d7cfa77e7 100644
--- a/website/docs/services/codeartifact/domains/index.md
+++ b/website/docs/services/codeartifact/domains/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>domain</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain_name",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>domain</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The ARN of the domain."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-domain.html"><code>AWS::CodeArtifact::Domain</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>domains_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>domain</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ arn
 FROM awscc.codeartifact.domains
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>domains</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.codeartifact.domains_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -213,6 +267,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.codeartifact.domains
+SET data__PatchDocument = string('{{ {
+    "PermissionsPolicyDocument": permissions_policy_document,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codeartifact/domains_list_only/index.md b/website/docs/services/codeartifact/domains_list_only/index.md
deleted file mode 100644
index 2a44861f0..000000000
--- a/website/docs/services/codeartifact/domains_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: domains_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - domains_list_only
-  - codeartifact
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>domains</code> in a region or regions, for all properties use <a href="/services/codeartifact/domains/"><code>domains</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>domains_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The resource schema to create a CodeArtifact domain.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codeartifact.domains_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The ARN of the domain."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>domains</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.codeartifact.domains_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>domains_list_only</code> resource, see <a href="/services/codeartifact/domains/#permissions"><code>domains</code></a>
-
diff --git a/website/docs/services/codeartifact/index.md b/website/docs/services/codeartifact/index.md
index 2ead5464e..f4a6128f7 100644
--- a/website/docs/services/codeartifact/index.md
+++ b/website/docs/services/codeartifact/index.md
@@ -20,7 +20,7 @@ The codeartifact service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The codeartifact service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/codeartifact/domains/">domains</a><br />
-<a href="/services/codeartifact/domains_list_only/">domains_list_only</a><br />
 <a href="/services/codeartifact/package_groups/">package_groups</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/codeartifact/package_groups_list_only/">package_groups_list_only</a><br />
-<a href="/services/codeartifact/repositories/">repositories</a><br />
-<a href="/services/codeartifact/repositories_list_only/">repositories_list_only</a>
+<a href="/services/codeartifact/repositories/">repositories</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/codeartifact/package_groups/index.md b/website/docs/services/codeartifact/package_groups/index.md
index 7b3fb5fbc..4210fa82d 100644
--- a/website/docs/services/codeartifact/package_groups/index.md
+++ b/website/docs/services/codeartifact/package_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>package_group</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain_name",
@@ -118,6 +127,23 @@ Creates, updates, deletes or gets a <code>package_group</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The ARN of the package group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-packagegroup.html"><code>AWS::CodeArtifact::PackageGroup</code></a>.
 
@@ -127,31 +153,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>package_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Pattern, DomainName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>package_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>package_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>package_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>package_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -160,6 +192,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>package_group</code>.
 ```sql
 SELECT
@@ -175,6 +216,19 @@ arn
 FROM awscc.codeartifact.package_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>package_groups</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.codeartifact.package_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -270,6 +324,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.codeartifact.package_groups
+SET data__PatchDocument = string('{{ {
+    "DomainOwner": domain_owner,
+    "ContactInfo": contact_info,
+    "Description": description,
+    "OriginConfiguration": origin_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codeartifact/package_groups_list_only/index.md b/website/docs/services/codeartifact/package_groups_list_only/index.md
deleted file mode 100644
index 38d25357f..000000000
--- a/website/docs/services/codeartifact/package_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: package_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - package_groups_list_only
-  - codeartifact
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>package_groups</code> in a region or regions, for all properties use <a href="/services/codeartifact/package_groups/"><code>package_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>package_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The resource schema to create a CodeArtifact package group.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codeartifact.package_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The ARN of the package group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>package_groups</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.codeartifact.package_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>package_groups_list_only</code> resource, see <a href="/services/codeartifact/package_groups/#permissions"><code>package_groups</code></a>
-
diff --git a/website/docs/services/codeartifact/repositories/index.md b/website/docs/services/codeartifact/repositories/index.md
index 6f98ab374..ebcc0ec5e 100644
--- a/website/docs/services/codeartifact/repositories/index.md
+++ b/website/docs/services/codeartifact/repositories/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>repository</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "repository_name",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets a <code>repository</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The ARN of the repository."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-repository.html"><code>AWS::CodeArtifact::Repository</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>repositories</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RepositoryName, DomainName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>repositories</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>repositories</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>repositories_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>repositories</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>repository</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ tags
 FROM awscc.codeartifact.repositories
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>repositories</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.codeartifact.repositories_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -251,6 +305,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.codeartifact.repositories
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "ExternalConnections": external_connections,
+    "Upstreams": upstreams,
+    "PermissionsPolicyDocument": permissions_policy_document,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codeartifact/repositories_list_only/index.md b/website/docs/services/codeartifact/repositories_list_only/index.md
deleted file mode 100644
index 6a7a2232d..000000000
--- a/website/docs/services/codeartifact/repositories_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: repositories_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - repositories_list_only
-  - codeartifact
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>repositories</code> in a region or regions, for all properties use <a href="/services/codeartifact/repositories/"><code>repositories</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>repositories_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The resource schema to create a CodeArtifact repository.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codeartifact.repositories_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The ARN of the repository."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>repositories</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.codeartifact.repositories_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>repositories_list_only</code> resource, see <a href="/services/codeartifact/repositories/#permissions"><code>repositories</code></a>
-
diff --git a/website/docs/services/codebuild/fleets/index.md b/website/docs/services/codebuild/fleets/index.md
index 720abd787..84d73cf41 100644
--- a/website/docs/services/codebuild/fleets/index.md
+++ b/website/docs/services/codebuild/fleets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>fleet</code> resource or lists <code>f
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -219,6 +228,23 @@ Creates, updates, deletes or gets a <code>fleet</code> resource or lists <code>f
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-fleet.html"><code>AWS::CodeBuild::Fleet</code></a>.
 
@@ -228,31 +254,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>fleets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -261,6 +293,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>fleet</code>.
 ```sql
 SELECT
@@ -281,6 +322,19 @@ compute_configuration
 FROM awscc.codebuild.fleets
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>fleets</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.codebuild.fleets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -430,6 +484,30 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.codebuild.fleets
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "BaseCapacity": base_capacity,
+    "EnvironmentType": environment_type,
+    "ComputeType": compute_type,
+    "OverflowBehavior": overflow_behavior,
+    "FleetServiceRole": fleet_service_role,
+    "FleetVpcConfig": fleet_vpc_config,
+    "FleetProxyConfiguration": fleet_proxy_configuration,
+    "Tags": tags,
+    "ImageId": image_id,
+    "ScalingConfiguration": scaling_configuration,
+    "ComputeConfiguration": compute_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codebuild/fleets_list_only/index.md b/website/docs/services/codebuild/fleets_list_only/index.md
deleted file mode 100644
index 81c9cb5bb..000000000
--- a/website/docs/services/codebuild/fleets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: fleets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - fleets_list_only
-  - codebuild
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>fleets</code> in a region or regions, for all properties use <a href="/services/codebuild/fleets/"><code>fleets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>fleets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::CodeBuild::Fleet</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codebuild.fleets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>fleets</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.codebuild.fleets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>fleets_list_only</code> resource, see <a href="/services/codebuild/fleets/#permissions"><code>fleets</code></a>
-
diff --git a/website/docs/services/codebuild/index.md b/website/docs/services/codebuild/index.md
index afb3ec3c1..654a56738 100644
--- a/website/docs/services/codebuild/index.md
+++ b/website/docs/services/codebuild/index.md
@@ -20,7 +20,7 @@ The codebuild service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The codebuild service documentation.
 <a href="/services/codebuild/fleets/">fleets</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/codebuild/fleets_list_only/">fleets_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/codeconnections/connections/index.md b/website/docs/services/codeconnections/connections/index.md
index 186eeeceb..b2a17c63e 100644
--- a/website/docs/services/codeconnections/connections/index.md
+++ b/website/docs/services/codeconnections/connections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>connection</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "connection_arn",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>connection</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "connection_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the connection. The ARN is used as the connection reference when the connection is shared between AWS services."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeconnections-connection.html"><code>AWS::CodeConnections::Connection</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConnectionName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>connections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>connection</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.codeconnections.connections
 WHERE region = 'us-east-1' AND data__Identifier = '<ConnectionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>connections</code> in a region.
+```sql
+SELECT
+region,
+connection_arn
+FROM awscc.codeconnections.connections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +271,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.codeconnections.connections
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConnectionArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codeconnections/connections_list_only/index.md b/website/docs/services/codeconnections/connections_list_only/index.md
deleted file mode 100644
index b76d4fb2b..000000000
--- a/website/docs/services/codeconnections/connections_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: connections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - connections_list_only
-  - codeconnections
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>connections</code> in a region or regions, for all properties use <a href="/services/codeconnections/connections/"><code>connections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>connections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Schema for AWS::CodeConnections::Connection resource which can be used to connect external source providers with other AWS services (i.e. AWS CodePipeline)</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codeconnections.connections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "connection_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the connection. The ARN is used as the connection reference when the connection is shared between AWS services."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>connections</code> in a region.
-```sql
-SELECT
-region,
-connection_arn
-FROM awscc.codeconnections.connections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>connections_list_only</code> resource, see <a href="/services/codeconnections/connections/#permissions"><code>connections</code></a>
-
diff --git a/website/docs/services/codeconnections/index.md b/website/docs/services/codeconnections/index.md
index 1cfa36281..fbc6d8498 100644
--- a/website/docs/services/codeconnections/index.md
+++ b/website/docs/services/codeconnections/index.md
@@ -20,7 +20,7 @@ The codeconnections service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The codeconnections service documentation.
 <a href="/services/codeconnections/connections/">connections</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/codeconnections/connections_list_only/">connections_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/codedeploy/applications/index.md b/website/docs/services/codedeploy/applications/index.md
index b1e39d6f8..6ea3779ca 100644
--- a/website/docs/services/codedeploy/applications/index.md
+++ b/website/docs/services/codedeploy/applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "application_name",
@@ -67,6 +76,23 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_name",
+    "type": "string",
+    "description": "A name for the application. If you don't specify a name, AWS CloudFormation generates a unique physical ID and uses that ID for the application name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-application.html"><code>AWS::CodeDeploy::Application</code></a>.
 
@@ -76,31 +102,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -109,6 +141,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ tags
 FROM awscc.codedeploy.applications
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>applications</code> in a region.
+```sql
+SELECT
+region,
+application_name
+FROM awscc.codedeploy.applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -193,6 +247,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.codedeploy.applications
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codedeploy/applications_list_only/index.md b/website/docs/services/codedeploy/applications_list_only/index.md
deleted file mode 100644
index a725f3bd3..000000000
--- a/website/docs/services/codedeploy/applications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - applications_list_only
-  - codedeploy
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>applications</code> in a region or regions, for all properties use <a href="/services/codedeploy/applications/"><code>applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::CodeDeploy::Application resource creates an AWS CodeDeploy application</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codedeploy.applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_name",
-    "type": "string",
-    "description": "A name for the application. If you don't specify a name, AWS CloudFormation generates a unique physical ID and uses that ID for the application name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>applications</code> in a region.
-```sql
-SELECT
-region,
-application_name
-FROM awscc.codedeploy.applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>applications_list_only</code> resource, see <a href="/services/codedeploy/applications/#permissions"><code>applications</code></a>
-
diff --git a/website/docs/services/codedeploy/deployment_configs/index.md b/website/docs/services/codedeploy/deployment_configs/index.md
index b18bfdc8a..6f5ce6e89 100644
--- a/website/docs/services/codedeploy/deployment_configs/index.md
+++ b/website/docs/services/codedeploy/deployment_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>deployment_config</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "compute_platform",
@@ -147,6 +156,23 @@ Creates, updates, deletes or gets a <code>deployment_config</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "deployment_config_name",
+    "type": "string",
+    "description": "A name for the deployment configuration. If you don't specify a name, AWS CloudFormation generates a unique physical ID and uses that ID for the deployment configuration name. For more information, see Name Type."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentconfig.html"><code>AWS::CodeDeploy::DeploymentConfig</code></a>.
 
@@ -156,26 +182,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>deployment_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>deployment_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>deployment_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>deployment_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -184,6 +215,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>deployment_config</code>.
 ```sql
 SELECT
@@ -196,6 +236,19 @@ traffic_routing_config
 FROM awscc.codedeploy.deployment_configs
 WHERE region = 'us-east-1' AND data__Identifier = '<DeploymentConfigName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>deployment_configs</code> in a region.
+```sql
+SELECT
+region,
+deployment_config_name
+FROM awscc.codedeploy.deployment_configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -294,6 +347,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codedeploy/deployment_configs_list_only/index.md b/website/docs/services/codedeploy/deployment_configs_list_only/index.md
deleted file mode 100644
index 9a74c5aeb..000000000
--- a/website/docs/services/codedeploy/deployment_configs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: deployment_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - deployment_configs_list_only
-  - codedeploy
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>deployment_configs</code> in a region or regions, for all properties use <a href="/services/codedeploy/deployment_configs/"><code>deployment_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>deployment_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::CodeDeploy::DeploymentConfig</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codedeploy.deployment_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "deployment_config_name",
-    "type": "string",
-    "description": "A name for the deployment configuration. If you don't specify a name, AWS CloudFormation generates a unique physical ID and uses that ID for the deployment configuration name. For more information, see Name Type."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>deployment_configs</code> in a region.
-```sql
-SELECT
-region,
-deployment_config_name
-FROM awscc.codedeploy.deployment_configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>deployment_configs_list_only</code> resource, see <a href="/services/codedeploy/deployment_configs/#permissions"><code>deployment_configs</code></a>
-
diff --git a/website/docs/services/codedeploy/index.md b/website/docs/services/codedeploy/index.md
index 81b09dbba..e27b64f3e 100644
--- a/website/docs/services/codedeploy/index.md
+++ b/website/docs/services/codedeploy/index.md
@@ -20,7 +20,7 @@ The codedeploy service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The codedeploy service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/codedeploy/applications/">applications</a><br />
-<a href="/services/codedeploy/applications_list_only/">applications_list_only</a>
+<a href="/services/codedeploy/applications/">applications</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/codedeploy/deployment_configs/">deployment_configs</a><br />
-<a href="/services/codedeploy/deployment_configs_list_only/">deployment_configs_list_only</a>
+<a href="/services/codedeploy/deployment_configs/">deployment_configs</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/codeguruprofiler/index.md b/website/docs/services/codeguruprofiler/index.md
index 88a78bbd8..9c65ef101 100644
--- a/website/docs/services/codeguruprofiler/index.md
+++ b/website/docs/services/codeguruprofiler/index.md
@@ -20,7 +20,7 @@ The codeguruprofiler service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The codeguruprofiler service documentation.
 <a href="/services/codeguruprofiler/profiling_groups/">profiling_groups</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/codeguruprofiler/profiling_groups_list_only/">profiling_groups_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/codeguruprofiler/profiling_groups/index.md b/website/docs/services/codeguruprofiler/profiling_groups/index.md
index 8ffe78aff..14082e5ab 100644
--- a/website/docs/services/codeguruprofiler/profiling_groups/index.md
+++ b/website/docs/services/codeguruprofiler/profiling_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>profiling_group</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "profiling_group_name",
@@ -101,6 +110,23 @@ Creates, updates, deletes or gets a <code>profiling_group</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "profiling_group_name",
+    "type": "string",
+    "description": "The name of the profiling group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeguruprofiler-profilinggroup.html"><code>AWS::CodeGuruProfiler::ProfilingGroup</code></a>.
 
@@ -110,31 +136,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>profiling_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ProfilingGroupName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>profiling_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>profiling_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>profiling_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>profiling_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -143,6 +175,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>profiling_group</code>.
 ```sql
 SELECT
@@ -156,6 +197,19 @@ tags
 FROM awscc.codeguruprofiler.profiling_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<ProfilingGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>profiling_groups</code> in a region.
+```sql
+SELECT
+region,
+profiling_group_name
+FROM awscc.codeguruprofiler.profiling_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -238,6 +292,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.codeguruprofiler.profiling_groups
+SET data__PatchDocument = string('{{ {
+    "AgentPermissions": agent_permissions,
+    "AnomalyDetectionNotificationConfiguration": anomaly_detection_notification_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ProfilingGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codeguruprofiler/profiling_groups_list_only/index.md b/website/docs/services/codeguruprofiler/profiling_groups_list_only/index.md
deleted file mode 100644
index 13309ae29..000000000
--- a/website/docs/services/codeguruprofiler/profiling_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: profiling_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - profiling_groups_list_only
-  - codeguruprofiler
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>profiling_groups</code> in a region or regions, for all properties use <a href="/services/codeguruprofiler/profiling_groups/"><code>profiling_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>profiling_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This resource schema represents the Profiling Group resource in the Amazon CodeGuru Profiler service.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codeguruprofiler.profiling_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "profiling_group_name",
-    "type": "string",
-    "description": "The name of the profiling group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>profiling_groups</code> in a region.
-```sql
-SELECT
-region,
-profiling_group_name
-FROM awscc.codeguruprofiler.profiling_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>profiling_groups_list_only</code> resource, see <a href="/services/codeguruprofiler/profiling_groups/#permissions"><code>profiling_groups</code></a>
-
diff --git a/website/docs/services/codegurureviewer/index.md b/website/docs/services/codegurureviewer/index.md
index e53a10911..b86566135 100644
--- a/website/docs/services/codegurureviewer/index.md
+++ b/website/docs/services/codegurureviewer/index.md
@@ -20,7 +20,7 @@ The codegurureviewer service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The codegurureviewer service documentation.
 <a href="/services/codegurureviewer/repository_associations/">repository_associations</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/codegurureviewer/repository_associations_list_only/">repository_associations_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/codegurureviewer/repository_associations/index.md b/website/docs/services/codegurureviewer/repository_associations/index.md
index 5e504c96f..2e0023562 100644
--- a/website/docs/services/codegurureviewer/repository_associations/index.md
+++ b/website/docs/services/codegurureviewer/repository_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>repository_association</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>repository_association</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "association_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the repository association."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codegurureviewer-repositoryassociation.html"><code>AWS::CodeGuruReviewer::RepositoryAssociation</code></a>.
 
@@ -96,26 +122,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>repository_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>repository_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>repository_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>repository_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +155,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>repository_association</code>.
 ```sql
 SELECT
@@ -138,6 +178,19 @@ tags
 FROM awscc.codegurureviewer.repository_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<AssociationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>repository_associations</code> in a region.
+```sql
+SELECT
+region,
+association_arn
+FROM awscc.codegurureviewer.repository_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -222,6 +275,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codegurureviewer/repository_associations_list_only/index.md b/website/docs/services/codegurureviewer/repository_associations_list_only/index.md
deleted file mode 100644
index 66f6f9482..000000000
--- a/website/docs/services/codegurureviewer/repository_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: repository_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - repository_associations_list_only
-  - codegurureviewer
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>repository_associations</code> in a region or regions, for all properties use <a href="/services/codegurureviewer/repository_associations/"><code>repository_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>repository_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This resource schema represents the RepositoryAssociation resource in the Amazon CodeGuru Reviewer service.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codegurureviewer.repository_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "association_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the repository association."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>repository_associations</code> in a region.
-```sql
-SELECT
-region,
-association_arn
-FROM awscc.codegurureviewer.repository_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>repository_associations_list_only</code> resource, see <a href="/services/codegurureviewer/repository_associations/#permissions"><code>repository_associations</code></a>
-
diff --git a/website/docs/services/codepipeline/custom_action_types/index.md b/website/docs/services/codepipeline/custom_action_types/index.md
index 10f75d97b..fd2e28c8e 100644
--- a/website/docs/services/codepipeline/custom_action_types/index.md
+++ b/website/docs/services/codepipeline/custom_action_types/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>custom_action_type</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "category",
@@ -163,6 +172,38 @@ Creates, updates, deletes or gets a <code>custom_action_type</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "category",
+    "type": "string",
+    "description": "The category of the custom action, such as a build action or a test action."
+  },
+  {
+    "name": "provider",
+    "type": "string",
+    "description": "The provider of the service used in the custom action, such as AWS CodeDeploy."
+  },
+  {
+    "name": "version",
+    "type": "string",
+    "description": "The version identifier of the custom action."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html"><code>AWS::CodePipeline::CustomActionType</code></a>.
 
@@ -172,31 +213,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>custom_action_types</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Category, InputArtifactDetails, OutputArtifactDetails, Provider, Version, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>custom_action_types</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>custom_action_types</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>custom_action_types_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>custom_action_types</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -205,6 +252,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>custom_action_type</code>.
 ```sql
 SELECT
@@ -221,6 +277,21 @@ id
 FROM awscc.codepipeline.custom_action_types
 WHERE region = 'us-east-1' AND data__Identifier = '<Category>|<Provider>|<Version>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>custom_action_types</code> in a region.
+```sql
+SELECT
+region,
+category,
+provider,
+version
+FROM awscc.codepipeline.custom_action_types_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -332,6 +403,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.codepipeline.custom_action_types
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Category>|<Provider>|<Version>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codepipeline/custom_action_types_list_only/index.md b/website/docs/services/codepipeline/custom_action_types_list_only/index.md
deleted file mode 100644
index 2d9e1b5c8..000000000
--- a/website/docs/services/codepipeline/custom_action_types_list_only/index.md
+++ /dev/null
@@ -1,97 +0,0 @@
----
-title: custom_action_types_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - custom_action_types_list_only
-  - codepipeline
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>custom_action_types</code> in a region or regions, for all properties use <a href="/services/codepipeline/custom_action_types/"><code>custom_action_types</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>custom_action_types_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::CodePipeline::CustomActionType resource creates a custom action for activities that aren't included in the CodePipeline default actions, such as running an internally developed build process or a test suite. You can use these custom actions in the stage of a pipeline.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codepipeline.custom_action_types_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "category",
-    "type": "string",
-    "description": "The category of the custom action, such as a build action or a test action."
-  },
-  {
-    "name": "provider",
-    "type": "string",
-    "description": "The provider of the service used in the custom action, such as AWS CodeDeploy."
-  },
-  {
-    "name": "version",
-    "type": "string",
-    "description": "The version identifier of the custom action."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>custom_action_types</code> in a region.
-```sql
-SELECT
-region,
-category,
-provider,
-version
-FROM awscc.codepipeline.custom_action_types_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>custom_action_types_list_only</code> resource, see <a href="/services/codepipeline/custom_action_types/#permissions"><code>custom_action_types</code></a>
-
diff --git a/website/docs/services/codepipeline/index.md b/website/docs/services/codepipeline/index.md
index 06a70f807..808a61ec2 100644
--- a/website/docs/services/codepipeline/index.md
+++ b/website/docs/services/codepipeline/index.md
@@ -20,7 +20,7 @@ The codepipeline service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The codepipeline service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/codepipeline/custom_action_types/">custom_action_types</a><br />
-<a href="/services/codepipeline/custom_action_types_list_only/">custom_action_types_list_only</a><br />
 <a href="/services/codepipeline/pipelines/">pipelines</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/codepipeline/pipelines_list_only/">pipelines_list_only</a><br />
-<a href="/services/codepipeline/webhooks/">webhooks</a><br />
-<a href="/services/codepipeline/webhooks_list_only/">webhooks_list_only</a>
+<a href="/services/codepipeline/webhooks/">webhooks</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/codepipeline/pipelines/index.md b/website/docs/services/codepipeline/pipelines/index.md
index 47982f771..75e9f7669 100644
--- a/website/docs/services/codepipeline/pipelines/index.md
+++ b/website/docs/services/codepipeline/pipelines/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>pipeline</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "artifact_stores",
@@ -522,6 +531,23 @@ Creates, updates, deletes or gets a <code>pipeline</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the pipeline."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html"><code>AWS::CodePipeline::Pipeline</code></a>.
 
@@ -531,31 +557,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Stages, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>pipelines_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -564,6 +596,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>pipeline</code>.
 ```sql
 SELECT
@@ -584,6 +625,19 @@ tags
 FROM awscc.codepipeline.pipelines
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>pipelines</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.codepipeline.pipelines_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -785,6 +839,29 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.codepipeline.pipelines
+SET data__PatchDocument = string('{{ {
+    "ArtifactStores": artifact_stores,
+    "DisableInboundStageTransitions": disable_inbound_stage_transitions,
+    "Stages": stages,
+    "ExecutionMode": execution_mode,
+    "RestartExecutionOnUpdate": restart_execution_on_update,
+    "Triggers": triggers,
+    "RoleArn": role_arn,
+    "Variables": variables,
+    "ArtifactStore": artifact_store,
+    "PipelineType": pipeline_type,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codepipeline/pipelines_list_only/index.md b/website/docs/services/codepipeline/pipelines_list_only/index.md
deleted file mode 100644
index 2b0173921..000000000
--- a/website/docs/services/codepipeline/pipelines_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: pipelines_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - pipelines_list_only
-  - codepipeline
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>pipelines</code> in a region or regions, for all properties use <a href="/services/codepipeline/pipelines/"><code>pipelines</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>pipelines_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::CodePipeline::Pipeline resource creates a CodePipeline pipeline that describes how software changes go through a release process.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codepipeline.pipelines_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the pipeline."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>pipelines</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.codepipeline.pipelines_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>pipelines_list_only</code> resource, see <a href="/services/codepipeline/pipelines/#permissions"><code>pipelines</code></a>
-
diff --git a/website/docs/services/codepipeline/webhooks/index.md b/website/docs/services/codepipeline/webhooks/index.md
index d7bacf62a..55fb0a410 100644
--- a/website/docs/services/codepipeline/webhooks/index.md
+++ b/website/docs/services/codepipeline/webhooks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>webhook</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "authentication_configuration",
@@ -114,6 +123,23 @@ Creates, updates, deletes or gets a <code>webhook</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "logical id of the webhook"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-webhook.html"><code>AWS::CodePipeline::Webhook</code></a>.
 
@@ -123,31 +149,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>webhooks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AuthenticationConfiguration, Filters, Authentication, TargetPipeline, TargetAction, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>webhooks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>webhooks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>webhooks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>webhooks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +188,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>webhook</code>.
 ```sql
 SELECT
@@ -173,6 +214,19 @@ register_with_third_party
 FROM awscc.codepipeline.webhooks
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>webhooks</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.codepipeline.webhooks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -273,6 +327,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.codepipeline.webhooks
+SET data__PatchDocument = string('{{ {
+    "AuthenticationConfiguration": authentication_configuration,
+    "Filters": filters,
+    "Authentication": authentication,
+    "TargetPipeline": target_pipeline,
+    "TargetAction": target_action,
+    "TargetPipelineVersion": target_pipeline_version,
+    "RegisterWithThirdParty": register_with_third_party
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codepipeline/webhooks_list_only/index.md b/website/docs/services/codepipeline/webhooks_list_only/index.md
deleted file mode 100644
index dece41e78..000000000
--- a/website/docs/services/codepipeline/webhooks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: webhooks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - webhooks_list_only
-  - codepipeline
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>webhooks</code> in a region or regions, for all properties use <a href="/services/codepipeline/webhooks/"><code>webhooks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>webhooks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::CodePipeline::Webhook</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codepipeline.webhooks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "logical id of the webhook"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>webhooks</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.codepipeline.webhooks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>webhooks_list_only</code> resource, see <a href="/services/codepipeline/webhooks/#permissions"><code>webhooks</code></a>
-
diff --git a/website/docs/services/codestarconnections/connections/index.md b/website/docs/services/codestarconnections/connections/index.md
index e455e6685..3d89ec698 100644
--- a/website/docs/services/codestarconnections/connections/index.md
+++ b/website/docs/services/codestarconnections/connections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>connection</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "connection_arn",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>connection</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "connection_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the connection. The ARN is used as the connection reference when the connection is shared between AWS services."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarconnections-connection.html"><code>AWS::CodeStarConnections::Connection</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConnectionName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>connections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>connection</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.codestarconnections.connections
 WHERE region = 'us-east-1' AND data__Identifier = '<ConnectionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>connections</code> in a region.
+```sql
+SELECT
+region,
+connection_arn
+FROM awscc.codestarconnections.connections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +271,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.codestarconnections.connections
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConnectionArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codestarconnections/connections_list_only/index.md b/website/docs/services/codestarconnections/connections_list_only/index.md
deleted file mode 100644
index 3039e2e88..000000000
--- a/website/docs/services/codestarconnections/connections_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: connections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - connections_list_only
-  - codestarconnections
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>connections</code> in a region or regions, for all properties use <a href="/services/codestarconnections/connections/"><code>connections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>connections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Schema for AWS::CodeStarConnections::Connection resource which can be used to connect external source providers with AWS CodePipeline</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codestarconnections.connections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "connection_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the connection. The ARN is used as the connection reference when the connection is shared between AWS services."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>connections</code> in a region.
-```sql
-SELECT
-region,
-connection_arn
-FROM awscc.codestarconnections.connections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>connections_list_only</code> resource, see <a href="/services/codestarconnections/connections/#permissions"><code>connections</code></a>
-
diff --git a/website/docs/services/codestarconnections/index.md b/website/docs/services/codestarconnections/index.md
index 4db4f8e7d..9a4c6080d 100644
--- a/website/docs/services/codestarconnections/index.md
+++ b/website/docs/services/codestarconnections/index.md
@@ -20,7 +20,7 @@ The codestarconnections service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The codestarconnections service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/codestarconnections/connections/">connections</a><br />
-<a href="/services/codestarconnections/connections_list_only/">connections_list_only</a><br />
 <a href="/services/codestarconnections/repository_links/">repository_links</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/codestarconnections/repository_links_list_only/">repository_links_list_only</a><br />
-<a href="/services/codestarconnections/sync_configurations/">sync_configurations</a><br />
-<a href="/services/codestarconnections/sync_configurations_list_only/">sync_configurations_list_only</a>
+<a href="/services/codestarconnections/sync_configurations/">sync_configurations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/codestarconnections/repository_links/index.md b/website/docs/services/codestarconnections/repository_links/index.md
index 33a0b0954..b92b7ac7f 100644
--- a/website/docs/services/codestarconnections/repository_links/index.md
+++ b/website/docs/services/codestarconnections/repository_links/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>repository_link</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "connection_arn",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>repository_link</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "repository_link_arn",
+    "type": "string",
+    "description": "A unique Amazon Resource Name (ARN) to designate the repository link."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarconnections-repositorylink.html"><code>AWS::CodeStarConnections::RepositoryLink</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>repository_links</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RepositoryName, ConnectionArn, OwnerId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>repository_links</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>repository_links</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>repository_links_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>repository_links</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>repository_link</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.codestarconnections.repository_links
 WHERE region = 'us-east-1' AND data__Identifier = '<RepositoryLinkArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>repository_links</code> in a region.
+```sql
+SELECT
+region,
+repository_link_arn
+FROM awscc.codestarconnections.repository_links_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -231,6 +285,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.codestarconnections.repository_links
+SET data__PatchDocument = string('{{ {
+    "ConnectionArn": connection_arn,
+    "EncryptionKeyArn": encryption_key_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RepositoryLinkArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codestarconnections/repository_links_list_only/index.md b/website/docs/services/codestarconnections/repository_links_list_only/index.md
deleted file mode 100644
index cfa5a5d83..000000000
--- a/website/docs/services/codestarconnections/repository_links_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: repository_links_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - repository_links_list_only
-  - codestarconnections
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>repository_links</code> in a region or regions, for all properties use <a href="/services/codestarconnections/repository_links/"><code>repository_links</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>repository_links_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Schema for AWS::CodeStarConnections::RepositoryLink resource which is used to aggregate repository metadata relevant to synchronizing source provider content to AWS Resources.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codestarconnections.repository_links_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "repository_link_arn",
-    "type": "string",
-    "description": "A unique Amazon Resource Name (ARN) to designate the repository link."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>repository_links</code> in a region.
-```sql
-SELECT
-region,
-repository_link_arn
-FROM awscc.codestarconnections.repository_links_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>repository_links_list_only</code> resource, see <a href="/services/codestarconnections/repository_links/#permissions"><code>repository_links</code></a>
-
diff --git a/website/docs/services/codestarconnections/sync_configurations/index.md b/website/docs/services/codestarconnections/sync_configurations/index.md
index 7c2a6af47..0d767971f 100644
--- a/website/docs/services/codestarconnections/sync_configurations/index.md
+++ b/website/docs/services/codestarconnections/sync_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>sync_configuration</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "owner_id",
@@ -95,6 +104,28 @@ Creates, updates, deletes or gets a <code>sync_configuration</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "resource_name",
+    "type": "string",
+    "description": "The name of the resource that is being synchronized to the repository."
+  },
+  {
+    "name": "sync_type",
+    "type": "string",
+    "description": "The type of resource synchronization service that is to be configured, for example, CFN&#95;STACK&#95;SYNC."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarconnections-syncconfiguration.html"><code>AWS::CodeStarConnections::SyncConfiguration</code></a>.
 
@@ -104,31 +135,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>sync_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Branch, ConfigFile, RepositoryLinkId, ResourceName, SyncType, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>sync_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>sync_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>sync_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>sync_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -137,6 +174,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>sync_configuration</code>.
 ```sql
 SELECT
@@ -155,6 +201,20 @@ repository_link_id
 FROM awscc.codestarconnections.sync_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<ResourceName>|<SyncType>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>sync_configurations</code> in a region.
+```sql
+SELECT
+region,
+resource_name,
+sync_type
+FROM awscc.codestarconnections.sync_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -253,6 +313,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.codestarconnections.sync_configurations
+SET data__PatchDocument = string('{{ {
+    "Branch": branch,
+    "ConfigFile": config_file,
+    "RoleArn": role_arn,
+    "PublishDeploymentStatus": publish_deployment_status,
+    "TriggerResourceUpdateOn": trigger_resource_update_on,
+    "RepositoryLinkId": repository_link_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ResourceName>|<SyncType>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codestarconnections/sync_configurations_list_only/index.md b/website/docs/services/codestarconnections/sync_configurations_list_only/index.md
deleted file mode 100644
index be7347078..000000000
--- a/website/docs/services/codestarconnections/sync_configurations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: sync_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - sync_configurations_list_only
-  - codestarconnections
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>sync_configurations</code> in a region or regions, for all properties use <a href="/services/codestarconnections/sync_configurations/"><code>sync_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>sync_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Schema for AWS::CodeStarConnections::SyncConfiguration resource which is used to enables an AWS resource to be synchronized from a source-provider.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codestarconnections.sync_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "resource_name",
-    "type": "string",
-    "description": "The name of the resource that is being synchronized to the repository."
-  },
-  {
-    "name": "sync_type",
-    "type": "string",
-    "description": "The type of resource synchronization service that is to be configured, for example, CFN&#95;STACK&#95;SYNC."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>sync_configurations</code> in a region.
-```sql
-SELECT
-region,
-resource_name,
-sync_type
-FROM awscc.codestarconnections.sync_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>sync_configurations_list_only</code> resource, see <a href="/services/codestarconnections/sync_configurations/#permissions"><code>sync_configurations</code></a>
-
diff --git a/website/docs/services/codestarnotifications/index.md b/website/docs/services/codestarnotifications/index.md
index e559d0b3e..0e5391b71 100644
--- a/website/docs/services/codestarnotifications/index.md
+++ b/website/docs/services/codestarnotifications/index.md
@@ -20,7 +20,7 @@ The codestarnotifications service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The codestarnotifications service documentation.
 <a href="/services/codestarnotifications/notification_rules/">notification_rules</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/codestarnotifications/notification_rules_list_only/">notification_rules_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/codestarnotifications/notification_rules/index.md b/website/docs/services/codestarnotifications/notification_rules/index.md
index 8b30e15dd..b2226a7bd 100644
--- a/website/docs/services/codestarnotifications/notification_rules/index.md
+++ b/website/docs/services/codestarnotifications/notification_rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>notification_rule</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "event_type_id",
@@ -107,6 +116,23 @@ Creates, updates, deletes or gets a <code>notification_rule</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarnotifications-notificationrule.html"><code>AWS::CodeStarNotifications::NotificationRule</code></a>.
 
@@ -116,31 +142,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>notification_rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EventTypeIds, Resource, DetailType, Targets, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>notification_rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>notification_rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>notification_rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>notification_rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -149,6 +181,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>notification_rule</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ arn
 FROM awscc.codestarnotifications.notification_rules
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>notification_rules</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.codestarnotifications.notification_rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -274,6 +328,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.codestarnotifications.notification_rules
+SET data__PatchDocument = string('{{ {
+    "EventTypeId": event_type_id,
+    "CreatedBy": created_by,
+    "TargetAddress": target_address,
+    "EventTypeIds": event_type_ids,
+    "Status": status,
+    "DetailType": detail_type,
+    "Targets": targets,
+    "Tags": tags,
+    "Name": name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/codestarnotifications/notification_rules_list_only/index.md b/website/docs/services/codestarnotifications/notification_rules_list_only/index.md
deleted file mode 100644
index 60e02b22b..000000000
--- a/website/docs/services/codestarnotifications/notification_rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: notification_rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - notification_rules_list_only
-  - codestarnotifications
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>notification_rules</code> in a region or regions, for all properties use <a href="/services/codestarnotifications/notification_rules/"><code>notification_rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>notification_rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::CodeStarNotifications::NotificationRule</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.codestarnotifications.notification_rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>notification_rules</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.codestarnotifications.notification_rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>notification_rules_list_only</code> resource, see <a href="/services/codestarnotifications/notification_rules/#permissions"><code>notification_rules</code></a>
-
diff --git a/website/docs/services/cognito/identity_pool_principal_tags/index.md b/website/docs/services/cognito/identity_pool_principal_tags/index.md
index 604da904c..a37da76ef 100644
--- a/website/docs/services/cognito/identity_pool_principal_tags/index.md
+++ b/website/docs/services/cognito/identity_pool_principal_tags/index.md
@@ -33,6 +33,15 @@ Expands all tag keys and values for <code>identity_pool_principals</code> in a r
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "identity_pool_id",
@@ -70,6 +79,28 @@ Expands all tag keys and values for <code>identity_pool_principals</code> in a r
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "identity_pool_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "identity_provider_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypoolprincipaltag.html"><code>AWS::Cognito::IdentityPoolPrincipalTag</code></a>.
 
@@ -79,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>identity_pool_principal_tags</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IdentityPoolId, IdentityProviderName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>identity_pool_principal_tags</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>identity_pool_principal_tags</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>identity_pool_principal_tags_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>identity_pool_principal_tags</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -111,30 +148,41 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 </table>
 
 ## `SELECT` examples
-Expands tags for all <code>identity_pool_principals</code> in a region.
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>identity_pool_principal_tag</code>.
 ```sql
 SELECT
 region,
 identity_pool_id,
 identity_provider_name,
 use_defaults,
-principal_tags,
-tag_key,
-tag_value
+principal_tags
 FROM awscc.cognito.identity_pool_principal_tags
-WHERE region = 'us-east-1';
+WHERE region = 'us-east-1' AND data__Identifier = '<IdentityPoolId>|<IdentityProviderName>';
 ```
-Gets all properties from an individual <code>identity_pool_principal_tag</code>.
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>identity_pool_principal_tags</code> in a region.
 ```sql
 SELECT
 region,
 identity_pool_id,
-identity_provider_name,
-use_defaults,
-principal_tags
-FROM awscc.cognito.identity_pool_principal_tags
-WHERE region = 'us-east-1' AND data__Identifier = '<IdentityPoolId>|<IdentityProviderName>';
+identity_provider_name
+FROM awscc.cognito.identity_pool_principal_tags_list_only
+WHERE region = 'us-east-1';
 ```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -209,6 +257,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cognito.identity_pool_principal_tags
+SET data__PatchDocument = string('{{ {
+    "UseDefaults": use_defaults,
+    "PrincipalTags": principal_tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IdentityPoolId>|<IdentityProviderName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cognito/identity_pool_principal_tags_list_only/index.md b/website/docs/services/cognito/identity_pool_principal_tags_list_only/index.md
deleted file mode 100644
index a9b69b016..000000000
--- a/website/docs/services/cognito/identity_pool_principal_tags_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: identity_pool_principal_tags_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - identity_pool_principal_tags_list_only
-  - cognito
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>identity_pool_principal_tags</code> in a region or regions, for all properties use <a href="/services/cognito/identity_pool_principal_tags/"><code>identity_pool_principal_tags</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>identity_pool_principal_tags_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Cognito::IdentityPoolPrincipalTag</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cognito.identity_pool_principal_tags_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "identity_pool_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "identity_provider_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>identity_pool_principal_tags</code> in a region.
-```sql
-SELECT
-region,
-identity_pool_id,
-identity_provider_name
-FROM awscc.cognito.identity_pool_principal_tags_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>identity_pool_principal_tags_list_only</code> resource, see <a href="/services/cognito/identity_pool_principal_tags/#permissions"><code>identity_pool_principal_tags</code></a>
-
diff --git a/website/docs/services/cognito/identity_pool_role_attachments/index.md b/website/docs/services/cognito/identity_pool_role_attachments/index.md
index 8d9a0c667..3a79d94ce 100644
--- a/website/docs/services/cognito/identity_pool_role_attachments/index.md
+++ b/website/docs/services/cognito/identity_pool_role_attachments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>identity_pool_role_attachment</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "identity_pool_id",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets an <code>identity_pool_role_attachment</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypoolroleattachment.html"><code>AWS::Cognito::IdentityPoolRoleAttachment</code></a>.
 
@@ -69,31 +95,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>identity_pool_role_attachments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IdentityPoolId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>identity_pool_role_attachments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>identity_pool_role_attachments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>identity_pool_role_attachments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>identity_pool_role_attachments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +134,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>identity_pool_role_attachment</code>.
 ```sql
 SELECT
@@ -113,6 +154,19 @@ role_mappings
 FROM awscc.cognito.identity_pool_role_attachments
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>identity_pool_role_attachments</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.cognito.identity_pool_role_attachments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -181,6 +235,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cognito.identity_pool_role_attachments
+SET data__PatchDocument = string('{{ {
+    "Roles": roles,
+    "RoleMappings": role_mappings
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cognito/identity_pool_role_attachments_list_only/index.md b/website/docs/services/cognito/identity_pool_role_attachments_list_only/index.md
deleted file mode 100644
index ed1374392..000000000
--- a/website/docs/services/cognito/identity_pool_role_attachments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: identity_pool_role_attachments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - identity_pool_role_attachments_list_only
-  - cognito
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>identity_pool_role_attachments</code> in a region or regions, for all properties use <a href="/services/cognito/identity_pool_role_attachments/"><code>identity_pool_role_attachments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>identity_pool_role_attachments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Cognito::IdentityPoolRoleAttachment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cognito.identity_pool_role_attachments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>identity_pool_role_attachments</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.cognito.identity_pool_role_attachments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>identity_pool_role_attachments_list_only</code> resource, see <a href="/services/cognito/identity_pool_role_attachments/#permissions"><code>identity_pool_role_attachments</code></a>
-
diff --git a/website/docs/services/cognito/identity_pools/index.md b/website/docs/services/cognito/identity_pools/index.md
index ae6a8af8b..23b1d8a2a 100644
--- a/website/docs/services/cognito/identity_pools/index.md
+++ b/website/docs/services/cognito/identity_pools/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>identity_pool</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "push_sync",
@@ -168,6 +177,23 @@ Creates, updates, deletes or gets an <code>identity_pool</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html"><code>AWS::Cognito::IdentityPool</code></a>.
 
@@ -177,31 +203,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>identity_pools</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AllowUnauthenticatedIdentities, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>identity_pools</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>identity_pools</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>identity_pools_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>identity_pools</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -210,6 +242,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>identity_pool</code>.
 ```sql
 SELECT
@@ -231,6 +272,19 @@ identity_pool_tags
 FROM awscc.cognito.identity_pools
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>identity_pools</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.cognito.identity_pools_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -348,6 +402,30 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cognito.identity_pools
+SET data__PatchDocument = string('{{ {
+    "PushSync": push_sync,
+    "CognitoIdentityProviders": cognito_identity_providers,
+    "DeveloperProviderName": developer_provider_name,
+    "CognitoStreams": cognito_streams,
+    "SupportedLoginProviders": supported_login_providers,
+    "CognitoEvents": cognito_events,
+    "IdentityPoolName": identity_pool_name,
+    "AllowUnauthenticatedIdentities": allow_unauthenticated_identities,
+    "SamlProviderARNs": saml_provider_arns,
+    "OpenIdConnectProviderARNs": open_id_connect_provider_arns,
+    "AllowClassicFlow": allow_classic_flow,
+    "IdentityPoolTags": identity_pool_tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cognito/identity_pools_list_only/index.md b/website/docs/services/cognito/identity_pools_list_only/index.md
deleted file mode 100644
index c294b2c92..000000000
--- a/website/docs/services/cognito/identity_pools_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: identity_pools_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - identity_pools_list_only
-  - cognito
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>identity_pools</code> in a region or regions, for all properties use <a href="/services/cognito/identity_pools/"><code>identity_pools</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>identity_pools_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Cognito::IdentityPool</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cognito.identity_pools_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>identity_pools</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.cognito.identity_pools_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>identity_pools_list_only</code> resource, see <a href="/services/cognito/identity_pools/#permissions"><code>identity_pools</code></a>
-
diff --git a/website/docs/services/cognito/index.md b/website/docs/services/cognito/index.md
index 2332f1268..2766eeb68 100644
--- a/website/docs/services/cognito/index.md
+++ b/website/docs/services/cognito/index.md
@@ -20,7 +20,7 @@ The cognito service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>24</b></span><br />
+<span>total resources:&nbsp;<b>15</b></span><br />
 </div>
 </div>
 
@@ -30,30 +30,21 @@ The cognito service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/cognito/identity_pool_principal_tags/">identity_pool_principal_tags</a><br />
-<a href="/services/cognito/identity_pool_principal_tags_list_only/">identity_pool_principal_tags_list_only</a><br />
 <a href="/services/cognito/identity_pool_role_attachments/">identity_pool_role_attachments</a><br />
-<a href="/services/cognito/identity_pool_role_attachments_list_only/">identity_pool_role_attachments_list_only</a><br />
 <a href="/services/cognito/identity_pools/">identity_pools</a><br />
-<a href="/services/cognito/identity_pools_list_only/">identity_pools_list_only</a><br />
 <a href="/services/cognito/log_delivery_configurations/">log_delivery_configurations</a><br />
 <a href="/services/cognito/managed_login_brandings/">managed_login_brandings</a><br />
 <a href="/services/cognito/user_pool_clients/">user_pool_clients</a><br />
-<a href="/services/cognito/user_pool_clients_list_only/">user_pool_clients_list_only</a><br />
 <a href="/services/cognito/user_pool_domains/">user_pool_domains</a><br />
 <a href="/services/cognito/user_pool_groups/">user_pool_groups</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/cognito/user_pool_groups_list_only/">user_pool_groups_list_only</a><br />
 <a href="/services/cognito/user_pool_identity_providers/">user_pool_identity_providers</a><br />
-<a href="/services/cognito/user_pool_identity_providers_list_only/">user_pool_identity_providers_list_only</a><br />
 <a href="/services/cognito/user_pool_resource_servers/">user_pool_resource_servers</a><br />
-<a href="/services/cognito/user_pool_resource_servers_list_only/">user_pool_resource_servers_list_only</a><br />
 <a href="/services/cognito/user_pool_risk_configuration_attachments/">user_pool_risk_configuration_attachments</a><br />
 <a href="/services/cognito/user_pool_user_to_group_attachments/">user_pool_user_to_group_attachments</a><br />
 <a href="/services/cognito/user_pool_users/">user_pool_users</a><br />
-<a href="/services/cognito/user_pool_users_list_only/">user_pool_users_list_only</a><br />
 <a href="/services/cognito/user_pools/">user_pools</a><br />
-<a href="/services/cognito/user_pools_list_only/">user_pools_list_only</a><br />
 <a href="/services/cognito/user_poolui_customization_attachments/">user_poolui_customization_attachments</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/cognito/log_delivery_configurations/index.md b/website/docs/services/cognito/log_delivery_configurations/index.md
index caba89056..34cff37e8 100644
--- a/website/docs/services/cognito/log_delivery_configurations/index.md
+++ b/website/docs/services/cognito/log_delivery_configurations/index.md
@@ -222,6 +222,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cognito.log_delivery_configurations
+SET data__PatchDocument = string('{{ {
+    "LogConfigurations": log_configurations
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cognito/managed_login_brandings/index.md b/website/docs/services/cognito/managed_login_brandings/index.md
index 195f94c32..d58206f1d 100644
--- a/website/docs/services/cognito/managed_login_brandings/index.md
+++ b/website/docs/services/cognito/managed_login_brandings/index.md
@@ -238,6 +238,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cognito.managed_login_brandings
+SET data__PatchDocument = string('{{ {
+    "UseCognitoProvidedValues": use_cognito_provided_values,
+    "Settings": settings,
+    "Assets": assets,
+    "ReturnMergedResources": return_merged_resources
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserPoolId>|<ManagedLoginBrandingId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cognito/user_pool_clients/index.md b/website/docs/services/cognito/user_pool_clients/index.md
index 998248168..1a2d98d59 100644
--- a/website/docs/services/cognito/user_pool_clients/index.md
+++ b/website/docs/services/cognito/user_pool_clients/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>user_pool_client</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "client_name",
@@ -226,6 +235,28 @@ Creates, updates, deletes or gets an <code>user_pool_client</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "user_pool_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "client_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html"><code>AWS::Cognito::UserPoolClient</code></a>.
 
@@ -235,31 +266,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>user_pool_clients</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="UserPoolId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>user_pool_clients</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>user_pool_clients</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>user_pool_clients_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>user_pool_clients</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -268,6 +305,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user_pool_client</code>.
 ```sql
 SELECT
@@ -301,6 +347,20 @@ client_id
 FROM awscc.cognito.user_pool_clients
 WHERE region = 'us-east-1' AND data__Identifier = '<UserPoolId>|<ClientId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>user_pool_clients</code> in a region.
+```sql
+SELECT
+region,
+user_pool_id,
+client_id
+FROM awscc.cognito.user_pool_clients_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -467,6 +527,39 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cognito.user_pool_clients
+SET data__PatchDocument = string('{{ {
+    "ClientName": client_name,
+    "ExplicitAuthFlows": explicit_auth_flows,
+    "ReadAttributes": read_attributes,
+    "AuthSessionValidity": auth_session_validity,
+    "RefreshTokenValidity": refresh_token_validity,
+    "AccessTokenValidity": access_token_validity,
+    "IdTokenValidity": id_token_validity,
+    "TokenValidityUnits": token_validity_units,
+    "RefreshTokenRotation": refresh_token_rotation,
+    "WriteAttributes": write_attributes,
+    "AllowedOAuthFlows": allowed_oauth_flows,
+    "AllowedOAuthFlowsUserPoolClient": allowed_oauth_flows_user_pool_client,
+    "AllowedOAuthScopes": allowed_oauth_scopes,
+    "CallbackURLs": callback_urls,
+    "DefaultRedirectURI": default_redirect_uri,
+    "LogoutURLs": logout_urls,
+    "SupportedIdentityProviders": supported_identity_providers,
+    "AnalyticsConfiguration": analytics_configuration,
+    "PreventUserExistenceErrors": prevent_user_existence_errors,
+    "EnableTokenRevocation": enable_token_revocation,
+    "EnablePropagateAdditionalUserContextData": enable_propagate_additional_user_context_data
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserPoolId>|<ClientId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cognito/user_pool_clients_list_only/index.md b/website/docs/services/cognito/user_pool_clients_list_only/index.md
deleted file mode 100644
index 1f1a05c23..000000000
--- a/website/docs/services/cognito/user_pool_clients_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: user_pool_clients_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - user_pool_clients_list_only
-  - cognito
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>user_pool_clients</code> in a region or regions, for all properties use <a href="/services/cognito/user_pool_clients/"><code>user_pool_clients</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>user_pool_clients_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Cognito::UserPoolClient</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cognito.user_pool_clients_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "user_pool_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "client_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>user_pool_clients</code> in a region.
-```sql
-SELECT
-region,
-user_pool_id,
-client_id
-FROM awscc.cognito.user_pool_clients_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>user_pool_clients_list_only</code> resource, see <a href="/services/cognito/user_pool_clients/#permissions"><code>user_pool_clients</code></a>
-
diff --git a/website/docs/services/cognito/user_pool_domains/index.md b/website/docs/services/cognito/user_pool_domains/index.md
index 0f3a75636..f0cc3f2c2 100644
--- a/website/docs/services/cognito/user_pool_domains/index.md
+++ b/website/docs/services/cognito/user_pool_domains/index.md
@@ -196,6 +196,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cognito.user_pool_domains
+SET data__PatchDocument = string('{{ {
+    "CustomDomainConfig": custom_domain_config,
+    "ManagedLoginVersion": managed_login_version
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserPoolId>|<Domain>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cognito/user_pool_groups/index.md b/website/docs/services/cognito/user_pool_groups/index.md
index 50db0f7e5..09b76e324 100644
--- a/website/docs/services/cognito/user_pool_groups/index.md
+++ b/website/docs/services/cognito/user_pool_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>user_pool_group</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -65,6 +74,28 @@ Creates, updates, deletes or gets an <code>user_pool_group</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "group_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "user_pool_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html"><code>AWS::Cognito::UserPoolGroup</code></a>.
 
@@ -74,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>user_pool_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="UserPoolId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>user_pool_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>user_pool_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>user_pool_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>user_pool_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user_pool_group</code>.
 ```sql
 SELECT
@@ -119,6 +165,20 @@ user_pool_id
 FROM awscc.cognito.user_pool_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<UserPoolId>|<GroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>user_pool_groups</code> in a region.
+```sql
+SELECT
+region,
+user_pool_id,
+group_name
+FROM awscc.cognito.user_pool_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -195,6 +255,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cognito.user_pool_groups
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Precedence": precedence,
+    "RoleArn": role_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserPoolId>|<GroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cognito/user_pool_groups_list_only/index.md b/website/docs/services/cognito/user_pool_groups_list_only/index.md
deleted file mode 100644
index 02fc94b97..000000000
--- a/website/docs/services/cognito/user_pool_groups_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: user_pool_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - user_pool_groups_list_only
-  - cognito
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>user_pool_groups</code> in a region or regions, for all properties use <a href="/services/cognito/user_pool_groups/"><code>user_pool_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>user_pool_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Cognito::UserPoolGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cognito.user_pool_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "group_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "user_pool_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>user_pool_groups</code> in a region.
-```sql
-SELECT
-region,
-user_pool_id,
-group_name
-FROM awscc.cognito.user_pool_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>user_pool_groups_list_only</code> resource, see <a href="/services/cognito/user_pool_groups/#permissions"><code>user_pool_groups</code></a>
-
diff --git a/website/docs/services/cognito/user_pool_identity_providers/index.md b/website/docs/services/cognito/user_pool_identity_providers/index.md
index a76f49bfc..041a371d3 100644
--- a/website/docs/services/cognito/user_pool_identity_providers/index.md
+++ b/website/docs/services/cognito/user_pool_identity_providers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>user_pool_identity_provider</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "user_pool_id",
@@ -70,6 +79,28 @@ Creates, updates, deletes or gets an <code>user_pool_identity_provider</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "user_pool_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "provider_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolidentityprovider.html"><code>AWS::Cognito::UserPoolIdentityProvider</code></a>.
 
@@ -79,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>user_pool_identity_providers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="UserPoolId, ProviderName, ProviderType, ProviderDetails, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>user_pool_identity_providers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>user_pool_identity_providers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>user_pool_identity_providers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>user_pool_identity_providers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user_pool_identity_provider</code>.
 ```sql
 SELECT
@@ -125,6 +171,20 @@ attribute_mapping
 FROM awscc.cognito.user_pool_identity_providers
 WHERE region = 'us-east-1' AND data__Identifier = '<UserPoolId>|<ProviderName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>user_pool_identity_providers</code> in a region.
+```sql
+SELECT
+region,
+user_pool_id,
+provider_name
+FROM awscc.cognito.user_pool_identity_providers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -212,6 +272,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cognito.user_pool_identity_providers
+SET data__PatchDocument = string('{{ {
+    "ProviderDetails": provider_details,
+    "IdpIdentifiers": idp_identifiers,
+    "AttributeMapping": attribute_mapping
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserPoolId>|<ProviderName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cognito/user_pool_identity_providers_list_only/index.md b/website/docs/services/cognito/user_pool_identity_providers_list_only/index.md
deleted file mode 100644
index a7a6455fd..000000000
--- a/website/docs/services/cognito/user_pool_identity_providers_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: user_pool_identity_providers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - user_pool_identity_providers_list_only
-  - cognito
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>user_pool_identity_providers</code> in a region or regions, for all properties use <a href="/services/cognito/user_pool_identity_providers/"><code>user_pool_identity_providers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>user_pool_identity_providers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Cognito::UserPoolIdentityProvider</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cognito.user_pool_identity_providers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "user_pool_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "provider_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>user_pool_identity_providers</code> in a region.
-```sql
-SELECT
-region,
-user_pool_id,
-provider_name
-FROM awscc.cognito.user_pool_identity_providers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>user_pool_identity_providers_list_only</code> resource, see <a href="/services/cognito/user_pool_identity_providers/#permissions"><code>user_pool_identity_providers</code></a>
-
diff --git a/website/docs/services/cognito/user_pool_resource_servers/index.md b/website/docs/services/cognito/user_pool_resource_servers/index.md
index 2a61d5282..4da7f2281 100644
--- a/website/docs/services/cognito/user_pool_resource_servers/index.md
+++ b/website/docs/services/cognito/user_pool_resource_servers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>user_pool_resource_server</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "user_pool_id",
@@ -72,6 +81,28 @@ Creates, updates, deletes or gets an <code>user_pool_resource_server</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "user_pool_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolresourceserver.html"><code>AWS::Cognito::UserPoolResourceServer</code></a>.
 
@@ -81,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>user_pool_resource_servers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="UserPoolId, Identifier, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>user_pool_resource_servers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>user_pool_resource_servers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>user_pool_resource_servers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>user_pool_resource_servers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user_pool_resource_server</code>.
 ```sql
 SELECT
@@ -125,6 +171,20 @@ scopes
 FROM awscc.cognito.user_pool_resource_servers
 WHERE region = 'us-east-1' AND data__Identifier = '<UserPoolId>|<Identifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>user_pool_resource_servers</code> in a region.
+```sql
+SELECT
+region,
+user_pool_id,
+identifier
+FROM awscc.cognito.user_pool_resource_servers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -203,6 +263,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cognito.user_pool_resource_servers
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Scopes": scopes
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserPoolId>|<Identifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cognito/user_pool_resource_servers_list_only/index.md b/website/docs/services/cognito/user_pool_resource_servers_list_only/index.md
deleted file mode 100644
index eb566e746..000000000
--- a/website/docs/services/cognito/user_pool_resource_servers_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: user_pool_resource_servers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - user_pool_resource_servers_list_only
-  - cognito
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>user_pool_resource_servers</code> in a region or regions, for all properties use <a href="/services/cognito/user_pool_resource_servers/"><code>user_pool_resource_servers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>user_pool_resource_servers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Cognito::UserPoolResourceServer</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cognito.user_pool_resource_servers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "user_pool_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>user_pool_resource_servers</code> in a region.
-```sql
-SELECT
-region,
-user_pool_id,
-identifier
-FROM awscc.cognito.user_pool_resource_servers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>user_pool_resource_servers_list_only</code> resource, see <a href="/services/cognito/user_pool_resource_servers/#permissions"><code>user_pool_resource_servers</code></a>
-
diff --git a/website/docs/services/cognito/user_pool_risk_configuration_attachments/index.md b/website/docs/services/cognito/user_pool_risk_configuration_attachments/index.md
index d21e11a76..c0d0f30bc 100644
--- a/website/docs/services/cognito/user_pool_risk_configuration_attachments/index.md
+++ b/website/docs/services/cognito/user_pool_risk_configuration_attachments/index.md
@@ -317,6 +317,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cognito.user_pool_risk_configuration_attachments
+SET data__PatchDocument = string('{{ {
+    "RiskExceptionConfiguration": risk_exception_configuration,
+    "CompromisedCredentialsRiskConfiguration": compromised_credentials_risk_configuration,
+    "AccountTakeoverRiskConfiguration": account_takeover_risk_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserPoolId>|<ClientId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cognito/user_pool_user_to_group_attachments/index.md b/website/docs/services/cognito/user_pool_user_to_group_attachments/index.md
index b700c17f8..084d9e5f0 100644
--- a/website/docs/services/cognito/user_pool_user_to_group_attachments/index.md
+++ b/website/docs/services/cognito/user_pool_user_to_group_attachments/index.md
@@ -169,6 +169,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cognito/user_pool_users/index.md b/website/docs/services/cognito/user_pool_users/index.md
index f7f6f8549..74f7fe535 100644
--- a/website/docs/services/cognito/user_pool_users/index.md
+++ b/website/docs/services/cognito/user_pool_users/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>user_pool_user</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "desired_delivery_mediums",
@@ -92,6 +101,28 @@ Creates, updates, deletes or gets an <code>user_pool_user</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "username",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "user_pool_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html"><code>AWS::Cognito::UserPoolUser</code></a>.
 
@@ -101,26 +132,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>user_pool_users</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="UserPoolId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>user_pool_users</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>user_pool_users_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>user_pool_users</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +165,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user_pool_user</code>.
 ```sql
 SELECT
@@ -144,6 +189,20 @@ client_metadata
 FROM awscc.cognito.user_pool_users
 WHERE region = 'us-east-1' AND data__Identifier = '<UserPoolId>|<Username>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>user_pool_users</code> in a region.
+```sql
+SELECT
+region,
+user_pool_id,
+username
+FROM awscc.cognito.user_pool_users_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -236,6 +295,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cognito/user_pool_users_list_only/index.md b/website/docs/services/cognito/user_pool_users_list_only/index.md
deleted file mode 100644
index 89bb2bb59..000000000
--- a/website/docs/services/cognito/user_pool_users_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: user_pool_users_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - user_pool_users_list_only
-  - cognito
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>user_pool_users</code> in a region or regions, for all properties use <a href="/services/cognito/user_pool_users/"><code>user_pool_users</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>user_pool_users_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Cognito::UserPoolUser</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cognito.user_pool_users_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "username",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "user_pool_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>user_pool_users</code> in a region.
-```sql
-SELECT
-region,
-user_pool_id,
-username
-FROM awscc.cognito.user_pool_users_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>user_pool_users_list_only</code> resource, see <a href="/services/cognito/user_pool_users/#permissions"><code>user_pool_users</code></a>
-
diff --git a/website/docs/services/cognito/user_pools/index.md b/website/docs/services/cognito/user_pools/index.md
index 8222a7d95..ef5527df9 100644
--- a/website/docs/services/cognito/user_pools/index.md
+++ b/website/docs/services/cognito/user_pools/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>user_pool</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "user_pool_name",
@@ -604,6 +613,23 @@ Creates, updates, deletes or gets an <code>user_pool</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "user_pool_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html"><code>AWS::Cognito::UserPool</code></a>.
 
@@ -613,31 +639,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>user_pools</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>user_pools</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>user_pools</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>user_pools_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>user_pools</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -646,6 +678,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user_pool</code>.
 ```sql
 SELECT
@@ -686,6 +727,19 @@ user_pool_tier
 FROM awscc.cognito.user_pools
 WHERE region = 'us-east-1' AND data__Identifier = '<UserPoolId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>user_pools</code> in a region.
+```sql
+SELECT
+region,
+user_pool_id
+FROM awscc.cognito.user_pools_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -991,6 +1045,47 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cognito.user_pools
+SET data__PatchDocument = string('{{ {
+    "UserPoolName": user_pool_name,
+    "Policies": policies,
+    "AccountRecoverySetting": account_recovery_setting,
+    "AdminCreateUserConfig": admin_create_user_config,
+    "AliasAttributes": alias_attributes,
+    "UsernameAttributes": username_attributes,
+    "AutoVerifiedAttributes": auto_verified_attributes,
+    "DeviceConfiguration": device_configuration,
+    "EmailConfiguration": email_configuration,
+    "EmailVerificationMessage": email_verification_message,
+    "EmailVerificationSubject": email_verification_subject,
+    "DeletionProtection": deletion_protection,
+    "LambdaConfig": lambda_config,
+    "MfaConfiguration": mfa_configuration,
+    "EnabledMfas": enabled_mfas,
+    "SmsAuthenticationMessage": sms_authentication_message,
+    "EmailAuthenticationMessage": email_authentication_message,
+    "EmailAuthenticationSubject": email_authentication_subject,
+    "SmsConfiguration": sms_configuration,
+    "SmsVerificationMessage": sms_verification_message,
+    "WebAuthnRelyingPartyID": web_authn_relying_party_id,
+    "WebAuthnUserVerification": web_authn_user_verification,
+    "Schema": schema,
+    "UsernameConfiguration": username_configuration,
+    "UserAttributeUpdateSettings": user_attribute_update_settings,
+    "UserPoolTags": user_pool_tags,
+    "VerificationMessageTemplate": verification_message_template,
+    "UserPoolAddOns": user_pool_add_ons,
+    "UserPoolTier": user_pool_tier
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserPoolId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cognito/user_pools_list_only/index.md b/website/docs/services/cognito/user_pools_list_only/index.md
deleted file mode 100644
index c0a3c1f7e..000000000
--- a/website/docs/services/cognito/user_pools_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: user_pools_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - user_pools_list_only
-  - cognito
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>user_pools</code> in a region or regions, for all properties use <a href="/services/cognito/user_pools/"><code>user_pools</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>user_pools_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Cognito::UserPool Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cognito.user_pools_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "user_pool_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>user_pools</code> in a region.
-```sql
-SELECT
-region,
-user_pool_id
-FROM awscc.cognito.user_pools_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>user_pools_list_only</code> resource, see <a href="/services/cognito/user_pools/#permissions"><code>user_pools</code></a>
-
diff --git a/website/docs/services/cognito/user_poolui_customization_attachments/index.md b/website/docs/services/cognito/user_poolui_customization_attachments/index.md
index 84b19eae2..fd1c7f7f2 100644
--- a/website/docs/services/cognito/user_poolui_customization_attachments/index.md
+++ b/website/docs/services/cognito/user_poolui_customization_attachments/index.md
@@ -172,6 +172,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cognito.user_poolui_customization_attachments
+SET data__PatchDocument = string('{{ {
+    "CSS": c_ss
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserPoolId>|<ClientId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/comprehend/document_classifiers/index.md b/website/docs/services/comprehend/document_classifiers/index.md
index b71ecf41d..bdd5cffb6 100644
--- a/website/docs/services/comprehend/document_classifiers/index.md
+++ b/website/docs/services/comprehend/document_classifiers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>document_classifier</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "data_access_role_arn",
@@ -214,6 +223,23 @@ Creates, updates, deletes or gets a <code>document_classifier</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-comprehend-documentclassifier.html"><code>AWS::Comprehend::DocumentClassifier</code></a>.
 
@@ -223,31 +249,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>document_classifiers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DocumentClassifierName, DataAccessRoleArn, InputDataConfig, LanguageCode, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>document_classifiers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>document_classifiers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>document_classifiers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>document_classifiers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -256,6 +288,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>document_classifier</code>.
 ```sql
 SELECT
@@ -276,6 +317,19 @@ arn
 FROM awscc.comprehend.document_classifiers
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>document_classifiers</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.comprehend.document_classifiers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -412,6 +466,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.comprehend.document_classifiers
+SET data__PatchDocument = string('{{ {
+    "ModelPolicy": model_policy,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/comprehend/document_classifiers_list_only/index.md b/website/docs/services/comprehend/document_classifiers_list_only/index.md
deleted file mode 100644
index 4f485b8d5..000000000
--- a/website/docs/services/comprehend/document_classifiers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: document_classifiers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - document_classifiers_list_only
-  - comprehend
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>document_classifiers</code> in a region or regions, for all properties use <a href="/services/comprehend/document_classifiers/"><code>document_classifiers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>document_classifiers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Document Classifier enables training document classifier models.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.comprehend.document_classifiers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>document_classifiers</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.comprehend.document_classifiers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>document_classifiers_list_only</code> resource, see <a href="/services/comprehend/document_classifiers/#permissions"><code>document_classifiers</code></a>
-
diff --git a/website/docs/services/comprehend/flywheels/index.md b/website/docs/services/comprehend/flywheels/index.md
index 20361298d..c98e39ecc 100644
--- a/website/docs/services/comprehend/flywheels/index.md
+++ b/website/docs/services/comprehend/flywheels/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>flywheel</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "active_model_arn",
@@ -164,6 +173,23 @@ Creates, updates, deletes or gets a <code>flywheel</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-comprehend-flywheel.html"><code>AWS::Comprehend::Flywheel</code></a>.
 
@@ -173,31 +199,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>flywheels</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FlywheelName, DataAccessRoleArn, DataLakeS3Uri, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>flywheels</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>flywheels</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>flywheels_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>flywheels</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -206,6 +238,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>flywheel</code>.
 ```sql
 SELECT
@@ -222,6 +263,19 @@ arn
 FROM awscc.comprehend.flywheels
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>flywheels</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.comprehend.flywheels_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -332,6 +386,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.comprehend.flywheels
+SET data__PatchDocument = string('{{ {
+    "ActiveModelArn": active_model_arn,
+    "DataAccessRoleArn": data_access_role_arn,
+    "DataSecurityConfig": data_security_config,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/comprehend/flywheels_list_only/index.md b/website/docs/services/comprehend/flywheels_list_only/index.md
deleted file mode 100644
index 758e8997d..000000000
--- a/website/docs/services/comprehend/flywheels_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: flywheels_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - flywheels_list_only
-  - comprehend
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>flywheels</code> in a region or regions, for all properties use <a href="/services/comprehend/flywheels/"><code>flywheels</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>flywheels_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Comprehend::Flywheel resource creates an Amazon Comprehend Flywheel that enables customer to train their model.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.comprehend.flywheels_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>flywheels</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.comprehend.flywheels_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>flywheels_list_only</code> resource, see <a href="/services/comprehend/flywheels/#permissions"><code>flywheels</code></a>
-
diff --git a/website/docs/services/comprehend/index.md b/website/docs/services/comprehend/index.md
index 4601aafc3..16a990f11 100644
--- a/website/docs/services/comprehend/index.md
+++ b/website/docs/services/comprehend/index.md
@@ -20,7 +20,7 @@ The comprehend service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The comprehend service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/comprehend/document_classifiers/">document_classifiers</a><br />
-<a href="/services/comprehend/document_classifiers_list_only/">document_classifiers_list_only</a>
+<a href="/services/comprehend/document_classifiers/">document_classifiers</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/comprehend/flywheels/">flywheels</a><br />
-<a href="/services/comprehend/flywheels_list_only/">flywheels_list_only</a>
+<a href="/services/comprehend/flywheels/">flywheels</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/config/aggregation_authorizations/index.md b/website/docs/services/config/aggregation_authorizations/index.md
index 752d7c0ff..ae47da055 100644
--- a/website/docs/services/config/aggregation_authorizations/index.md
+++ b/website/docs/services/config/aggregation_authorizations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>aggregation_authorization</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "authorized_account_id",
@@ -72,6 +81,28 @@ Creates, updates, deletes or gets an <code>aggregation_authorization</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "authorized_account_id",
+    "type": "string",
+    "description": "The 12-digit account ID of the account authorized to aggregate data."
+  },
+  {
+    "name": "authorized_aws_region",
+    "type": "string",
+    "description": "The region authorized to collect aggregated data."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-aggregationauthorization.html"><code>AWS::Config::AggregationAuthorization</code></a>.
 
@@ -81,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>aggregation_authorizations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AuthorizedAccountId, AuthorizedAwsRegion, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>aggregation_authorizations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>aggregation_authorizations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>aggregation_authorizations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>aggregation_authorizations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>aggregation_authorization</code>.
 ```sql
 SELECT
@@ -125,6 +171,20 @@ tags
 FROM awscc.config.aggregation_authorizations
 WHERE region = 'us-east-1' AND data__Identifier = '<AuthorizedAccountId>|<AuthorizedAwsRegion>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>aggregation_authorizations</code> in a region.
+```sql
+SELECT
+region,
+authorized_account_id,
+authorized_aws_region
+FROM awscc.config.aggregation_authorizations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -197,6 +257,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.config.aggregation_authorizations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AuthorizedAccountId>|<AuthorizedAwsRegion>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/config/aggregation_authorizations_list_only/index.md b/website/docs/services/config/aggregation_authorizations_list_only/index.md
deleted file mode 100644
index 595f0b294..000000000
--- a/website/docs/services/config/aggregation_authorizations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: aggregation_authorizations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - aggregation_authorizations_list_only
-  - config
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>aggregation_authorizations</code> in a region or regions, for all properties use <a href="/services/config/aggregation_authorizations/"><code>aggregation_authorizations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>aggregation_authorizations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Config::AggregationAuthorization</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.config.aggregation_authorizations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "authorized_account_id",
-    "type": "string",
-    "description": "The 12-digit account ID of the account authorized to aggregate data."
-  },
-  {
-    "name": "authorized_aws_region",
-    "type": "string",
-    "description": "The region authorized to collect aggregated data."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>aggregation_authorizations</code> in a region.
-```sql
-SELECT
-region,
-authorized_account_id,
-authorized_aws_region
-FROM awscc.config.aggregation_authorizations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>aggregation_authorizations_list_only</code> resource, see <a href="/services/config/aggregation_authorizations/#permissions"><code>aggregation_authorizations</code></a>
-
diff --git a/website/docs/services/config/config_rules/index.md b/website/docs/services/config/config_rules/index.md
index 3afc5b123..a7506787d 100644
--- a/website/docs/services/config/config_rules/index.md
+++ b/website/docs/services/config/config_rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>config_rule</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "config_rule_id",
@@ -182,6 +191,23 @@ Creates, updates, deletes or gets a <code>config_rule</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "config_rule_name",
+    "type": "string",
+    "description": "A name for the CC rule. If you don't specify a name, CFN generates a unique physical ID and uses that ID for the rule name. For more information, see &#91;Name Type&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-name.html)."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configrule.html"><code>AWS::Config::ConfigRule</code></a>.
 
@@ -191,31 +217,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>config_rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Source, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>config_rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>config_rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>config_rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>config_rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -224,6 +256,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>config_rule</code>.
 ```sql
 SELECT
@@ -241,6 +282,19 @@ evaluation_modes
 FROM awscc.config.config_rules
 WHERE region = 'us-east-1' AND data__Identifier = '<ConfigRuleName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>config_rules</code> in a region.
+```sql
+SELECT
+region,
+config_rule_name
+FROM awscc.config.config_rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -346,6 +400,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.config.config_rules
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Scope": scope,
+    "MaximumExecutionFrequency": maximum_execution_frequency,
+    "Source": source,
+    "InputParameters": input_parameters,
+    "EvaluationModes": evaluation_modes
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConfigRuleName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/config/config_rules_list_only/index.md b/website/docs/services/config/config_rules_list_only/index.md
deleted file mode 100644
index 4bdd86474..000000000
--- a/website/docs/services/config/config_rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: config_rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - config_rules_list_only
-  - config
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>config_rules</code> in a region or regions, for all properties use <a href="/services/config/config_rules/"><code>config_rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>config_rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>You must first create and start the CC configuration recorder in order to create CC managed rules with CFNlong. For more information, see &#91;Managing the Configuration Recorder&#93;(https://docs.aws.amazon.com/config/latest/developerguide/stop-start-recorder.html).<br />Adds or updates an CC rule to evaluate if your AWS resources comply with your desired configurations. For information on how many CC rules you can have per account, see &#91;Service Limits&#93;(https://docs.aws.amazon.com/config/latest/developerguide/configlimits.html) in the &#42;Developer Guide&#42;.<br />There are two types of rules: &#42;Managed Rules&#42; and &#42;Custom Rules&#42;. You can use the &#96;&#96;ConfigRule&#96;&#96; resource to create both CC Managed Rules and CC Custom Rules.<br />CC Managed Rules are predefined, customizable rules created by CC. For a list of managed rules, see &#91;List of Managed Rules&#93;(https://docs.aws.amazon.com/config/latest/developerguide/managed-rules-by-aws-config.html). If you are adding an CC managed rule, you must specify the rule's identifier for the &#96;&#96;SourceIdentifier&#96;&#96; key.<br />CC Custom Rules are rules that you create from scratch. There are two ways to create CC custom rules: with Lambda functions (&#91;Developer Guide&#93;(https://docs.aws.amazon.com/config/latest/developerguide/gettingstarted-concepts.html#gettingstarted-concepts-function)) and with CFNGUARDshort (&#91;Guard GitHub Repository&#93;(https://docs.aws.amazon.com/https://github.com/aws-cloudformation/cloudformation-guard)), a policy-as-code language. CC custom rules created with LAMlong are called &#42;Custom Lambda Rules&#42; and CC custom rules created with CFNGUARDshort are called &#42;Custom Policy Rules&#42;.<br />If you are adding a new CC Custom LAM rule, you first need to create an LAMlong function that the rule invokes to evaluate your resources. When you use the &#96;&#96;ConfigRule&#96;&#96; resource to add a Custom LAM rule to CC, you must specify the Amazon Resource Name (ARN) that LAMlong assigns to the function. You specify the ARN in the &#96;&#96;SourceIdentifier&#96;&#96; key. This key is part of the &#96;&#96;Source&#96;&#96; object, which is part of the &#96;&#96;ConfigRule&#96;&#96; object. <br />For any new CC rule that you add, specify the &#96;&#96;ConfigRuleName&#96;&#96; in the &#96;&#96;ConfigRule&#96;&#96; object. Do not specify the &#96;&#96;ConfigRuleArn&#96;&#96; or the &#96;&#96;ConfigRuleId&#96;&#96;. These values are generated by CC for new rules.<br />If you are updating a rule that you added previously, you can specify the rule by &#96;&#96;ConfigRuleName&#96;&#96;, &#96;&#96;ConfigRuleId&#96;&#96;, or &#96;&#96;ConfigRuleArn&#96;&#96; in the &#96;&#96;ConfigRule&#96;&#96; data type that you use in this request.<br />For more information about developing and using CC rules, see &#91;Evaluating Resources with Rules&#93;(https://docs.aws.amazon.com/config/latest/developerguide/evaluate-config.html) in the &#42;Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.config.config_rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "config_rule_name",
-    "type": "string",
-    "description": "A name for the CC rule. If you don't specify a name, CFN generates a unique physical ID and uses that ID for the rule name. For more information, see &#91;Name Type&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-name.html)."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>config_rules</code> in a region.
-```sql
-SELECT
-region,
-config_rule_name
-FROM awscc.config.config_rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>config_rules_list_only</code> resource, see <a href="/services/config/config_rules/#permissions"><code>config_rules</code></a>
-
diff --git a/website/docs/services/config/configuration_aggregators/index.md b/website/docs/services/config/configuration_aggregators/index.md
index cb12fa35d..cc919c7bd 100644
--- a/website/docs/services/config/configuration_aggregators/index.md
+++ b/website/docs/services/config/configuration_aggregators/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>configuration_aggregator</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "account_aggregation_sources",
@@ -111,6 +120,23 @@ Creates, updates, deletes or gets a <code>configuration_aggregator</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "configuration_aggregator_name",
+    "type": "string",
+    "description": "The name of the aggregator."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationaggregator.html"><code>AWS::Config::ConfigurationAggregator</code></a>.
 
@@ -120,31 +146,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>configuration_aggregators</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>configuration_aggregators</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>configuration_aggregators</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>configuration_aggregators_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>configuration_aggregators</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -153,6 +185,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>configuration_aggregator</code>.
 ```sql
 SELECT
@@ -165,6 +206,19 @@ tags
 FROM awscc.config.configuration_aggregators
 WHERE region = 'us-east-1' AND data__Identifier = '<ConfigurationAggregatorName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>configuration_aggregators</code> in a region.
+```sql
+SELECT
+region,
+configuration_aggregator_name
+FROM awscc.config.configuration_aggregators_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -254,6 +308,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.config.configuration_aggregators
+SET data__PatchDocument = string('{{ {
+    "AccountAggregationSources": account_aggregation_sources,
+    "OrganizationAggregationSource": organization_aggregation_source,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConfigurationAggregatorName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/config/configuration_aggregators_list_only/index.md b/website/docs/services/config/configuration_aggregators_list_only/index.md
deleted file mode 100644
index e21202fca..000000000
--- a/website/docs/services/config/configuration_aggregators_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: configuration_aggregators_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - configuration_aggregators_list_only
-  - config
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>configuration_aggregators</code> in a region or regions, for all properties use <a href="/services/config/configuration_aggregators/"><code>configuration_aggregators</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>configuration_aggregators_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Config::ConfigurationAggregator</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.config.configuration_aggregators_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "configuration_aggregator_name",
-    "type": "string",
-    "description": "The name of the aggregator."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>configuration_aggregators</code> in a region.
-```sql
-SELECT
-region,
-configuration_aggregator_name
-FROM awscc.config.configuration_aggregators_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>configuration_aggregators_list_only</code> resource, see <a href="/services/config/configuration_aggregators/#permissions"><code>configuration_aggregators</code></a>
-
diff --git a/website/docs/services/config/conformance_packs/index.md b/website/docs/services/config/conformance_packs/index.md
index 1e21f0fa9..c6eeb0dc9 100644
--- a/website/docs/services/config/conformance_packs/index.md
+++ b/website/docs/services/config/conformance_packs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>conformance_pack</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "conformance_pack_name",
@@ -99,6 +108,23 @@ Creates, updates, deletes or gets a <code>conformance_pack</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "conformance_pack_name",
+    "type": "string",
+    "description": "Name of the conformance pack which will be assigned as the unique identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-conformancepack.html"><code>AWS::Config::ConformancePack</code></a>.
 
@@ -108,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>conformance_packs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConformancePackName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>conformance_packs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>conformance_packs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>conformance_packs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>conformance_packs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>conformance_pack</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ conformance_pack_input_parameters
 FROM awscc.config.conformance_packs
 WHERE region = 'us-east-1' AND data__Identifier = '<ConformancePackName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>conformance_packs</code> in a region.
+```sql
+SELECT
+region,
+conformance_pack_name
+FROM awscc.config.conformance_packs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -243,6 +297,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.config.conformance_packs
+SET data__PatchDocument = string('{{ {
+    "DeliveryS3Bucket": delivery_s3_bucket,
+    "DeliveryS3KeyPrefix": delivery_s3_key_prefix,
+    "TemplateBody": template_body,
+    "TemplateS3Uri": template_s3_uri,
+    "TemplateSSMDocumentDetails": template_ssm_document_details,
+    "ConformancePackInputParameters": conformance_pack_input_parameters
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConformancePackName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/config/conformance_packs_list_only/index.md b/website/docs/services/config/conformance_packs_list_only/index.md
deleted file mode 100644
index d0dbc9934..000000000
--- a/website/docs/services/config/conformance_packs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: conformance_packs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - conformance_packs_list_only
-  - config
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>conformance_packs</code> in a region or regions, for all properties use <a href="/services/config/conformance_packs/"><code>conformance_packs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>conformance_packs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A conformance pack is a collection of AWS Config rules and remediation actions that can be easily deployed as a single entity in an account and a region or across an entire AWS Organization.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.config.conformance_packs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "conformance_pack_name",
-    "type": "string",
-    "description": "Name of the conformance pack which will be assigned as the unique identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>conformance_packs</code> in a region.
-```sql
-SELECT
-region,
-conformance_pack_name
-FROM awscc.config.conformance_packs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>conformance_packs_list_only</code> resource, see <a href="/services/config/conformance_packs/#permissions"><code>conformance_packs</code></a>
-
diff --git a/website/docs/services/config/index.md b/website/docs/services/config/index.md
index 92cc816ec..879af2525 100644
--- a/website/docs/services/config/index.md
+++ b/website/docs/services/config/index.md
@@ -20,7 +20,7 @@ The config service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>12</b></span><br />
+<span>total resources:&nbsp;<b>6</b></span><br />
 </div>
 </div>
 
@@ -30,18 +30,12 @@ The config service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/config/aggregation_authorizations/">aggregation_authorizations</a><br />
-<a href="/services/config/aggregation_authorizations_list_only/">aggregation_authorizations_list_only</a><br />
 <a href="/services/config/config_rules/">config_rules</a><br />
-<a href="/services/config/config_rules_list_only/">config_rules_list_only</a><br />
-<a href="/services/config/configuration_aggregators/">configuration_aggregators</a><br />
-<a href="/services/config/configuration_aggregators_list_only/">configuration_aggregators_list_only</a>
+<a href="/services/config/configuration_aggregators/">configuration_aggregators</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/config/conformance_packs/">conformance_packs</a><br />
-<a href="/services/config/conformance_packs_list_only/">conformance_packs_list_only</a><br />
 <a href="/services/config/organization_conformance_packs/">organization_conformance_packs</a><br />
-<a href="/services/config/organization_conformance_packs_list_only/">organization_conformance_packs_list_only</a><br />
-<a href="/services/config/stored_queries/">stored_queries</a><br />
-<a href="/services/config/stored_queries_list_only/">stored_queries_list_only</a>
+<a href="/services/config/stored_queries/">stored_queries</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/config/organization_conformance_packs/index.md b/website/docs/services/config/organization_conformance_packs/index.md
index 08ef703a7..93ae7e0c5 100644
--- a/website/docs/services/config/organization_conformance_packs/index.md
+++ b/website/docs/services/config/organization_conformance_packs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>organization_conformance_pack</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "organization_conformance_pack_name",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets an <code>organization_conformance_pack</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "organization_conformance_pack_name",
+    "type": "string",
+    "description": "The name of the organization conformance pack."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-organizationconformancepack.html"><code>AWS::Config::OrganizationConformancePack</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>organization_conformance_packs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="OrganizationConformancePackName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>organization_conformance_packs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>organization_conformance_packs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>organization_conformance_packs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>organization_conformance_packs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>organization_conformance_pack</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ excluded_accounts
 FROM awscc.config.organization_conformance_packs
 WHERE region = 'us-east-1' AND data__Identifier = '<OrganizationConformancePackName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>organization_conformance_packs</code> in a region.
+```sql
+SELECT
+region,
+organization_conformance_pack_name
+FROM awscc.config.organization_conformance_packs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -230,6 +284,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.config.organization_conformance_packs
+SET data__PatchDocument = string('{{ {
+    "TemplateS3Uri": template_s3_uri,
+    "TemplateBody": template_body,
+    "DeliveryS3Bucket": delivery_s3_bucket,
+    "DeliveryS3KeyPrefix": delivery_s3_key_prefix,
+    "ConformancePackInputParameters": conformance_pack_input_parameters,
+    "ExcludedAccounts": excluded_accounts
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<OrganizationConformancePackName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/config/organization_conformance_packs_list_only/index.md b/website/docs/services/config/organization_conformance_packs_list_only/index.md
deleted file mode 100644
index d24d12928..000000000
--- a/website/docs/services/config/organization_conformance_packs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: organization_conformance_packs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - organization_conformance_packs_list_only
-  - config
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>organization_conformance_packs</code> in a region or regions, for all properties use <a href="/services/config/organization_conformance_packs/"><code>organization_conformance_packs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>organization_conformance_packs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Config::OrganizationConformancePack.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.config.organization_conformance_packs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "organization_conformance_pack_name",
-    "type": "string",
-    "description": "The name of the organization conformance pack."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>organization_conformance_packs</code> in a region.
-```sql
-SELECT
-region,
-organization_conformance_pack_name
-FROM awscc.config.organization_conformance_packs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>organization_conformance_packs_list_only</code> resource, see <a href="/services/config/organization_conformance_packs/#permissions"><code>organization_conformance_packs</code></a>
-
diff --git a/website/docs/services/config/stored_queries/index.md b/website/docs/services/config/stored_queries/index.md
index 34e0d7682..5fcbccc66 100644
--- a/website/docs/services/config/stored_queries/index.md
+++ b/website/docs/services/config/stored_queries/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>stored_query</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "query_arn",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>stored_query</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "query_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-storedquery.html"><code>AWS::Config::StoredQuery</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>stored_queries</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="QueryName, QueryExpression, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>stored_queries</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>stored_queries</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>stored_queries_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>stored_queries</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>stored_query</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.config.stored_queries
 WHERE region = 'us-east-1' AND data__Identifier = '<QueryName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>stored_queries</code> in a region.
+```sql
+SELECT
+region,
+query_name
+FROM awscc.config.stored_queries_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -213,6 +267,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.config.stored_queries
+SET data__PatchDocument = string('{{ {
+    "QueryDescription": query_description,
+    "QueryExpression": query_expression,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<QueryName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/config/stored_queries_list_only/index.md b/website/docs/services/config/stored_queries_list_only/index.md
deleted file mode 100644
index ffab3844f..000000000
--- a/website/docs/services/config/stored_queries_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: stored_queries_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - stored_queries_list_only
-  - config
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>stored_queries</code> in a region or regions, for all properties use <a href="/services/config/stored_queries/"><code>stored_queries</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>stored_queries_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Config::StoredQuery</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.config.stored_queries_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "query_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>stored_queries</code> in a region.
-```sql
-SELECT
-region,
-query_name
-FROM awscc.config.stored_queries_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>stored_queries_list_only</code> resource, see <a href="/services/config/stored_queries/#permissions"><code>stored_queries</code></a>
-
diff --git a/website/docs/services/connect/agent_statuses/index.md b/website/docs/services/connect/agent_statuses/index.md
index 831d649ea..39c142ce3 100644
--- a/website/docs/services/connect/agent_statuses/index.md
+++ b/website/docs/services/connect/agent_statuses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>agent_status</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -107,6 +116,23 @@ Creates, updates, deletes or gets an <code>agent_status</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "agent_status_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the agent status."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-agentstatus.html"><code>AWS::Connect::AgentStatus</code></a>.
 
@@ -116,26 +142,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>agent_statuses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, Name, State, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>agent_statuses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>agent_statuses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>agent_statuses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +175,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>agent_status</code>.
 ```sql
 SELECT
@@ -162,6 +202,19 @@ last_modified_time
 FROM awscc.connect.agent_statuses
 WHERE region = 'us-east-1' AND data__Identifier = '<AgentStatusArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>agent_statuses</code> in a region.
+```sql
+SELECT
+region,
+agent_status_arn
+FROM awscc.connect.agent_statuses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -256,6 +309,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.agent_statuses
+SET data__PatchDocument = string('{{ {
+    "InstanceArn": instance_arn,
+    "Description": description,
+    "Name": name,
+    "DisplayOrder": display_order,
+    "State": state,
+    "Type": type,
+    "ResetOrderNumber": reset_order_number,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AgentStatusArn>';
+```
+
+
 ## Permissions
 
 To operate on the <code>agent_statuses</code> resource, the following permissions are required:
diff --git a/website/docs/services/connect/agent_statuses_list_only/index.md b/website/docs/services/connect/agent_statuses_list_only/index.md
deleted file mode 100644
index 8398b9a96..000000000
--- a/website/docs/services/connect/agent_statuses_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: agent_statuses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - agent_statuses_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>agent_statuses</code> in a region or regions, for all properties use <a href="/services/connect/agent_statuses/"><code>agent_statuses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>agent_statuses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::AgentStatus</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.agent_statuses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "agent_status_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the agent status."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>agent_statuses</code> in a region.
-```sql
-SELECT
-region,
-agent_status_arn
-FROM awscc.connect.agent_statuses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>agent_statuses_list_only</code> resource, see <a href="/services/connect/agent_statuses/#permissions"><code>agent_statuses</code></a>
-
diff --git a/website/docs/services/connect/approved_origins/index.md b/website/docs/services/connect/approved_origins/index.md
index 58ac40f20..e9bbc2962 100644
--- a/website/docs/services/connect/approved_origins/index.md
+++ b/website/docs/services/connect/approved_origins/index.md
@@ -33,6 +33,35 @@ Creates, updates, deletes or gets an <code>approved_origin</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "origin",
+    "type": "string",
+    "description": "Domain name to be added to the allowlist of instance"
+  },
+  {
+    "name": "instance_id",
+    "type": "string",
+    "description": "Amazon Connect instance identifier"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "origin",
@@ -50,6 +79,8 @@ Creates, updates, deletes or gets an <code>approved_origin</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-approvedorigin.html"><code>AWS::Connect::ApprovedOrigin</code></a>.
 
@@ -59,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>approved_origins</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Origin, InstanceId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>approved_origins</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>approved_origins_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>approved_origins</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>approved_origin</code>.
 ```sql
 SELECT
@@ -96,6 +141,20 @@ instance_id
 FROM awscc.connect.approved_origins
 WHERE region = 'us-east-1' AND data__Identifier = '<InstanceId>|<Origin>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>approved_origins</code> in a region.
+```sql
+SELECT
+region,
+instance_id,
+origin
+FROM awscc.connect.approved_origins_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -162,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/approved_origins_list_only/index.md b/website/docs/services/connect/approved_origins_list_only/index.md
deleted file mode 100644
index 2d8f9e43e..000000000
--- a/website/docs/services/connect/approved_origins_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: approved_origins_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - approved_origins_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>approved_origins</code> in a region or regions, for all properties use <a href="/services/connect/approved_origins/"><code>approved_origins</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>approved_origins_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::ApprovedOrigin</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.approved_origins_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "origin",
-    "type": "string",
-    "description": "Domain name to be added to the allowlist of instance"
-  },
-  {
-    "name": "instance_id",
-    "type": "string",
-    "description": "Amazon Connect instance identifier"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>approved_origins</code> in a region.
-```sql
-SELECT
-region,
-instance_id,
-origin
-FROM awscc.connect.approved_origins_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>approved_origins_list_only</code> resource, see <a href="/services/connect/approved_origins/#permissions"><code>approved_origins</code></a>
-
diff --git a/website/docs/services/connect/contact_flow_modules/index.md b/website/docs/services/connect/contact_flow_modules/index.md
index c00f10489..70e4a6335 100644
--- a/website/docs/services/connect/contact_flow_modules/index.md
+++ b/website/docs/services/connect/contact_flow_modules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>contact_flow_module</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>contact_flow_module</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "contact_flow_module_arn",
+    "type": "string",
+    "description": "The identifier of the contact flow module (ARN)."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflowmodule.html"><code>AWS::Connect::ContactFlowModule</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>contact_flow_modules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, Name, Content, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>contact_flow_modules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>contact_flow_modules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>contact_flow_modules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>contact_flow_modules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>contact_flow_module</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.connect.contact_flow_modules
 WHERE region = 'us-east-1' AND data__Identifier = '<ContactFlowModuleArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>contact_flow_modules</code> in a region.
+```sql
+SELECT
+region,
+contact_flow_module_arn
+FROM awscc.connect.contact_flow_modules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -235,6 +289,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.contact_flow_modules
+SET data__PatchDocument = string('{{ {
+    "InstanceArn": instance_arn,
+    "Name": name,
+    "Content": content,
+    "Description": description,
+    "State": state,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ContactFlowModuleArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/contact_flow_modules_list_only/index.md b/website/docs/services/connect/contact_flow_modules_list_only/index.md
deleted file mode 100644
index 01d4a7205..000000000
--- a/website/docs/services/connect/contact_flow_modules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: contact_flow_modules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - contact_flow_modules_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>contact_flow_modules</code> in a region or regions, for all properties use <a href="/services/connect/contact_flow_modules/"><code>contact_flow_modules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>contact_flow_modules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::ContactFlowModule.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.contact_flow_modules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "contact_flow_module_arn",
-    "type": "string",
-    "description": "The identifier of the contact flow module (ARN)."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>contact_flow_modules</code> in a region.
-```sql
-SELECT
-region,
-contact_flow_module_arn
-FROM awscc.connect.contact_flow_modules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>contact_flow_modules_list_only</code> resource, see <a href="/services/connect/contact_flow_modules/#permissions"><code>contact_flow_modules</code></a>
-
diff --git a/website/docs/services/connect/contact_flow_versions/index.md b/website/docs/services/connect/contact_flow_versions/index.md
index fe71e2128..c3cc698cc 100644
--- a/website/docs/services/connect/contact_flow_versions/index.md
+++ b/website/docs/services/connect/contact_flow_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>contact_flow_version</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "contact_flow_version_arn",
@@ -65,6 +74,28 @@ Creates, updates, deletes or gets a <code>contact_flow_version</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "contact_flow_version_arn",
+    "type": "string",
+    "description": "The identifier of the contact flow version (ARN)."
+  },
+  {
+    "name": "version",
+    "type": "integer",
+    "description": "The version number of this revision"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflowversion.html"><code>AWS::Connect::ContactFlowVersion</code></a>.
 
@@ -74,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>contact_flow_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ContactFlowId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>contact_flow_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>contact_flow_versions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>contact_flow_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>contact_flow_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>contact_flow_version</code>.
 ```sql
 SELECT
@@ -119,6 +165,19 @@ flow_content_sha256
 FROM awscc.connect.contact_flow_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<ContactFlowVersionARN>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>contact_flow_versions</code> in a region.
+```sql
+SELECT
+region,
+contact_flow_version_arn
+FROM awscc.connect.contact_flow_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -183,6 +242,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/contact_flow_versions_list_only/index.md b/website/docs/services/connect/contact_flow_versions_list_only/index.md
deleted file mode 100644
index 789e19793..000000000
--- a/website/docs/services/connect/contact_flow_versions_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: contact_flow_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - contact_flow_versions_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>contact_flow_versions</code> in a region or regions, for all properties use <a href="/services/connect/contact_flow_versions/"><code>contact_flow_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>contact_flow_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type Definition for ContactFlowVersion</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.contact_flow_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "contact_flow_version_arn",
-    "type": "string",
-    "description": "The identifier of the contact flow version (ARN)."
-  },
-  {
-    "name": "version",
-    "type": "integer",
-    "description": "The version number of this revision"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>contact_flow_versions</code> in a region.
-```sql
-SELECT
-region,
-contact_flow_version_arn
-FROM awscc.connect.contact_flow_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>contact_flow_versions_list_only</code> resource, see <a href="/services/connect/contact_flow_versions/#permissions"><code>contact_flow_versions</code></a>
-
diff --git a/website/docs/services/connect/contact_flows/index.md b/website/docs/services/connect/contact_flows/index.md
index 6d8a287bb..badc08ead 100644
--- a/website/docs/services/connect/contact_flows/index.md
+++ b/website/docs/services/connect/contact_flows/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>contact_flow</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>contact_flow</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "contact_flow_arn",
+    "type": "string",
+    "description": "The identifier of the contact flow (ARN)."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflow.html"><code>AWS::Connect::ContactFlow</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>contact_flows</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, Content, Name, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>contact_flows</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>contact_flows</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>contact_flows_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>contact_flows</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>contact_flow</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.connect.contact_flows
 WHERE region = 'us-east-1' AND data__Identifier = '<ContactFlowArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>contact_flows</code> in a region.
+```sql
+SELECT
+region,
+contact_flow_arn
+FROM awscc.connect.contact_flows_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -241,6 +295,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.contact_flows
+SET data__PatchDocument = string('{{ {
+    "InstanceArn": instance_arn,
+    "Name": name,
+    "Content": content,
+    "Description": description,
+    "State": state,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ContactFlowArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/contact_flows_list_only/index.md b/website/docs/services/connect/contact_flows_list_only/index.md
deleted file mode 100644
index 739b33b9c..000000000
--- a/website/docs/services/connect/contact_flows_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: contact_flows_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - contact_flows_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>contact_flows</code> in a region or regions, for all properties use <a href="/services/connect/contact_flows/"><code>contact_flows</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>contact_flows_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::ContactFlow</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.contact_flows_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "contact_flow_arn",
-    "type": "string",
-    "description": "The identifier of the contact flow (ARN)."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>contact_flows</code> in a region.
-```sql
-SELECT
-region,
-contact_flow_arn
-FROM awscc.connect.contact_flows_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>contact_flows_list_only</code> resource, see <a href="/services/connect/contact_flows/#permissions"><code>contact_flows</code></a>
-
diff --git a/website/docs/services/connect/email_addresses/index.md b/website/docs/services/connect/email_addresses/index.md
index a52950ab2..15005c16d 100644
--- a/website/docs/services/connect/email_addresses/index.md
+++ b/website/docs/services/connect/email_addresses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>email_address</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -82,6 +91,28 @@ Creates, updates, deletes or gets an <code>email_address</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "email_address_arn",
+    "type": "string",
+    "description": "The identifier of the email address."
+  },
+  {
+    "name": "email_address",
+    "type": "string",
+    "description": "Email address to be created for this instance"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-emailaddress.html"><code>AWS::Connect::EmailAddress</code></a>.
 
@@ -91,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>email_addresses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, EmailAddress, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>email_addresses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>email_addresses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>email_addresses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>email_addresses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>email_address</code>.
 ```sql
 SELECT
@@ -137,6 +183,19 @@ tags
 FROM awscc.connect.email_addresses
 WHERE region = 'us-east-1' AND data__Identifier = '<EmailAddressArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>email_addresses</code> in a region.
+```sql
+SELECT
+region,
+email_address_arn
+FROM awscc.connect.email_addresses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +276,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.email_addresses
+SET data__PatchDocument = string('{{ {
+    "InstanceArn": instance_arn,
+    "Description": description,
+    "DisplayName": display_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<EmailAddressArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/email_addresses_list_only/index.md b/website/docs/services/connect/email_addresses_list_only/index.md
deleted file mode 100644
index c33cbccce..000000000
--- a/website/docs/services/connect/email_addresses_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: email_addresses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - email_addresses_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>email_addresses</code> in a region or regions, for all properties use <a href="/services/connect/email_addresses/"><code>email_addresses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>email_addresses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::EmailAddress</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.email_addresses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "email_address_arn",
-    "type": "string",
-    "description": "The identifier of the email address."
-  },
-  {
-    "name": "email_address",
-    "type": "string",
-    "description": "Email address to be created for this instance"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>email_addresses</code> in a region.
-```sql
-SELECT
-region,
-email_address_arn
-FROM awscc.connect.email_addresses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>email_addresses_list_only</code> resource, see <a href="/services/connect/email_addresses/#permissions"><code>email_addresses</code></a>
-
diff --git a/website/docs/services/connect/evaluation_forms/index.md b/website/docs/services/connect/evaluation_forms/index.md
index d67f9efe6..82698cc94 100644
--- a/website/docs/services/connect/evaluation_forms/index.md
+++ b/website/docs/services/connect/evaluation_forms/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>evaluation_form</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "scoring_strategy",
@@ -157,6 +166,23 @@ Creates, updates, deletes or gets an <code>evaluation_form</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "evaluation_form_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-evaluationform.html"><code>AWS::Connect::EvaluationForm</code></a>.
 
@@ -166,31 +192,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>evaluation_forms</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Title, InstanceArn, Items, Status, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>evaluation_forms</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>evaluation_forms</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>evaluation_forms_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>evaluation_forms</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -199,6 +231,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>evaluation_form</code>.
 ```sql
 SELECT
@@ -215,6 +256,19 @@ tags
 FROM awscc.connect.evaluation_forms
 WHERE region = 'us-east-1' AND data__Identifier = '<EvaluationFormArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>evaluation_forms</code> in a region.
+```sql
+SELECT
+region,
+evaluation_form_arn
+FROM awscc.connect.evaluation_forms_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -355,6 +409,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.evaluation_forms
+SET data__PatchDocument = string('{{ {
+    "ScoringStrategy": scoring_strategy,
+    "Status": status,
+    "AutoEvaluationConfiguration": auto_evaluation_configuration,
+    "Description": description,
+    "InstanceArn": instance_arn,
+    "Title": title,
+    "Items": items,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<EvaluationFormArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/evaluation_forms_list_only/index.md b/website/docs/services/connect/evaluation_forms_list_only/index.md
deleted file mode 100644
index ad7c5f83d..000000000
--- a/website/docs/services/connect/evaluation_forms_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: evaluation_forms_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - evaluation_forms_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>evaluation_forms</code> in a region or regions, for all properties use <a href="/services/connect/evaluation_forms/"><code>evaluation_forms</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>evaluation_forms_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates an evaluation form for the specified CON instance.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.evaluation_forms_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "evaluation_form_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>evaluation_forms</code> in a region.
-```sql
-SELECT
-region,
-evaluation_form_arn
-FROM awscc.connect.evaluation_forms_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>evaluation_forms_list_only</code> resource, see <a href="/services/connect/evaluation_forms/#permissions"><code>evaluation_forms</code></a>
-
diff --git a/website/docs/services/connect/hours_of_operations/index.md b/website/docs/services/connect/hours_of_operations/index.md
index 750db190d..93d33bdba 100644
--- a/website/docs/services/connect/hours_of_operations/index.md
+++ b/website/docs/services/connect/hours_of_operations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>hours_of_operation</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -172,6 +181,23 @@ Creates, updates, deletes or gets a <code>hours_of_operation</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "hours_of_operation_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) for the hours of operation."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-hoursofoperation.html"><code>AWS::Connect::HoursOfOperation</code></a>.
 
@@ -181,31 +207,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>hours_of_operations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, Name, TimeZone, Config, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>hours_of_operations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>hours_of_operations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>hours_of_operations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>hours_of_operations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -214,6 +246,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>hours_of_operation</code>.
 ```sql
 SELECT
@@ -229,6 +270,19 @@ hours_of_operation_overrides
 FROM awscc.connect.hours_of_operations
 WHERE region = 'us-east-1' AND data__Identifier = '<HoursOfOperationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>hours_of_operations</code> in a region.
+```sql
+SELECT
+region,
+hours_of_operation_arn
+FROM awscc.connect.hours_of_operations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -337,6 +391,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.hours_of_operations
+SET data__PatchDocument = string('{{ {
+    "InstanceArn": instance_arn,
+    "Name": name,
+    "Description": description,
+    "TimeZone": time_zone,
+    "Config": config,
+    "Tags": tags,
+    "HoursOfOperationOverrides": hours_of_operation_overrides
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<HoursOfOperationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/hours_of_operations_list_only/index.md b/website/docs/services/connect/hours_of_operations_list_only/index.md
deleted file mode 100644
index 54ddad72b..000000000
--- a/website/docs/services/connect/hours_of_operations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: hours_of_operations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - hours_of_operations_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>hours_of_operations</code> in a region or regions, for all properties use <a href="/services/connect/hours_of_operations/"><code>hours_of_operations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>hours_of_operations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::HoursOfOperation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.hours_of_operations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "hours_of_operation_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) for the hours of operation."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>hours_of_operations</code> in a region.
-```sql
-SELECT
-region,
-hours_of_operation_arn
-FROM awscc.connect.hours_of_operations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>hours_of_operations_list_only</code> resource, see <a href="/services/connect/hours_of_operations/#permissions"><code>hours_of_operations</code></a>
-
diff --git a/website/docs/services/connect/index.md b/website/docs/services/connect/index.md
index bbb4b1219..561318a70 100644
--- a/website/docs/services/connect/index.md
+++ b/website/docs/services/connect/index.md
@@ -20,7 +20,7 @@ The connect service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>50</b></span><br />
+<span>total resources:&nbsp;<b>26</b></span><br />
 </div>
 </div>
 
@@ -30,56 +30,32 @@ The connect service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/connect/agent_statuses/">agent_statuses</a><br />
-<a href="/services/connect/agent_statuses_list_only/">agent_statuses_list_only</a><br />
 <a href="/services/connect/approved_origins/">approved_origins</a><br />
-<a href="/services/connect/approved_origins_list_only/">approved_origins_list_only</a><br />
 <a href="/services/connect/contact_flow_modules/">contact_flow_modules</a><br />
-<a href="/services/connect/contact_flow_modules_list_only/">contact_flow_modules_list_only</a><br />
 <a href="/services/connect/contact_flow_versions/">contact_flow_versions</a><br />
-<a href="/services/connect/contact_flow_versions_list_only/">contact_flow_versions_list_only</a><br />
 <a href="/services/connect/contact_flows/">contact_flows</a><br />
-<a href="/services/connect/contact_flows_list_only/">contact_flows_list_only</a><br />
 <a href="/services/connect/email_addresses/">email_addresses</a><br />
-<a href="/services/connect/email_addresses_list_only/">email_addresses_list_only</a><br />
 <a href="/services/connect/evaluation_forms/">evaluation_forms</a><br />
-<a href="/services/connect/evaluation_forms_list_only/">evaluation_forms_list_only</a><br />
 <a href="/services/connect/hours_of_operations/">hours_of_operations</a><br />
-<a href="/services/connect/hours_of_operations_list_only/">hours_of_operations_list_only</a><br />
 <a href="/services/connect/instance_storage_configs/">instance_storage_configs</a><br />
-<a href="/services/connect/instance_storage_configs_list_only/">instance_storage_configs_list_only</a><br />
 <a href="/services/connect/instances/">instances</a><br />
-<a href="/services/connect/instances_list_only/">instances_list_only</a><br />
 <a href="/services/connect/integration_associations/">integration_associations</a><br />
-<a href="/services/connect/integration_associations_list_only/">integration_associations_list_only</a><br />
 <a href="/services/connect/predefined_attributes/">predefined_attributes</a><br />
-<a href="/services/connect/predefined_attributes_list_only/">predefined_attributes_list_only</a><br />
 <a href="/services/connect/prompts/">prompts</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/connect/prompts_list_only/">prompts_list_only</a><br />
 <a href="/services/connect/queues/">queues</a><br />
-<a href="/services/connect/queues_list_only/">queues_list_only</a><br />
 <a href="/services/connect/quick_connects/">quick_connects</a><br />
-<a href="/services/connect/quick_connects_list_only/">quick_connects_list_only</a><br />
 <a href="/services/connect/routing_profiles/">routing_profiles</a><br />
-<a href="/services/connect/routing_profiles_list_only/">routing_profiles_list_only</a><br />
 <a href="/services/connect/rules/">rules</a><br />
 <a href="/services/connect/security_keys/">security_keys</a><br />
-<a href="/services/connect/security_keys_list_only/">security_keys_list_only</a><br />
 <a href="/services/connect/security_profiles/">security_profiles</a><br />
-<a href="/services/connect/security_profiles_list_only/">security_profiles_list_only</a><br />
 <a href="/services/connect/task_templates/">task_templates</a><br />
-<a href="/services/connect/task_templates_list_only/">task_templates_list_only</a><br />
 <a href="/services/connect/traffic_distribution_groups/">traffic_distribution_groups</a><br />
-<a href="/services/connect/traffic_distribution_groups_list_only/">traffic_distribution_groups_list_only</a><br />
 <a href="/services/connect/user_hierarchy_groups/">user_hierarchy_groups</a><br />
-<a href="/services/connect/user_hierarchy_groups_list_only/">user_hierarchy_groups_list_only</a><br />
 <a href="/services/connect/user_hierarchy_structures/">user_hierarchy_structures</a><br />
 <a href="/services/connect/users/">users</a><br />
-<a href="/services/connect/users_list_only/">users_list_only</a><br />
 <a href="/services/connect/view_versions/">view_versions</a><br />
-<a href="/services/connect/view_versions_list_only/">view_versions_list_only</a><br />
-<a href="/services/connect/views/">views</a><br />
-<a href="/services/connect/views_list_only/">views_list_only</a>
+<a href="/services/connect/views/">views</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/connect/instance_storage_configs/index.md b/website/docs/services/connect/instance_storage_configs/index.md
index 6efa682fb..c30c73fa4 100644
--- a/website/docs/services/connect/instance_storage_configs/index.md
+++ b/website/docs/services/connect/instance_storage_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>instance_storage_config</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -152,6 +161,33 @@ Creates, updates, deletes or gets an <code>instance_storage_config</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "instance_arn",
+    "type": "string",
+    "description": "Connect Instance ID with which the storage config will be associated"
+  },
+  {
+    "name": "resource_type",
+    "type": "string",
+    "description": "Specifies the type of storage resource available for the instance"
+  },
+  {
+    "name": "association_id",
+    "type": "string",
+    "description": "An associationID is automatically generated when a storage config is associated with an instance"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-instancestorageconfig.html"><code>AWS::Connect::InstanceStorageConfig</code></a>.
 
@@ -161,31 +197,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>instance_storage_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, ResourceType, StorageType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>instance_storage_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>instance_storage_configs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>instance_storage_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>instance_storage_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -194,6 +236,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>instance_storage_config</code>.
 ```sql
 SELECT
@@ -209,6 +260,21 @@ kinesis_firehose_config
 FROM awscc.connect.instance_storage_configs
 WHERE region = 'us-east-1' AND data__Identifier = '<InstanceArn>|<AssociationId>|<ResourceType>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>instance_storage_configs</code> in a region.
+```sql
+SELECT
+region,
+instance_arn,
+association_id,
+resource_type
+FROM awscc.connect.instance_storage_configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -307,6 +373,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.instance_storage_configs
+SET data__PatchDocument = string('{{ {
+    "StorageType": storage_type,
+    "S3Config": s3_config,
+    "KinesisVideoStreamConfig": kinesis_video_stream_config,
+    "KinesisStreamConfig": kinesis_stream_config,
+    "KinesisFirehoseConfig": kinesis_firehose_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InstanceArn>|<AssociationId>|<ResourceType>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/instance_storage_configs_list_only/index.md b/website/docs/services/connect/instance_storage_configs_list_only/index.md
deleted file mode 100644
index 1d9f8f086..000000000
--- a/website/docs/services/connect/instance_storage_configs_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: instance_storage_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - instance_storage_configs_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>instance_storage_configs</code> in a region or regions, for all properties use <a href="/services/connect/instance_storage_configs/"><code>instance_storage_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>instance_storage_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::InstanceStorageConfig</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.instance_storage_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "instance_arn",
-    "type": "string",
-    "description": "Connect Instance ID with which the storage config will be associated"
-  },
-  {
-    "name": "resource_type",
-    "type": "string",
-    "description": "Specifies the type of storage resource available for the instance"
-  },
-  {
-    "name": "association_id",
-    "type": "string",
-    "description": "An associationID is automatically generated when a storage config is associated with an instance"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>instance_storage_configs</code> in a region.
-```sql
-SELECT
-region,
-instance_arn,
-association_id,
-resource_type
-FROM awscc.connect.instance_storage_configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>instance_storage_configs_list_only</code> resource, see <a href="/services/connect/instance_storage_configs/#permissions"><code>instance_storage_configs</code></a>
-
diff --git a/website/docs/services/connect/instances/index.md b/website/docs/services/connect/instances/index.md
index 582135e18..ce8783bcd 100644
--- a/website/docs/services/connect/instances/index.md
+++ b/website/docs/services/connect/instances/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -164,6 +173,23 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "An instanceArn is automatically generated on creation based on instanceId."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-instance.html"><code>AWS::Connect::Instance</code></a>.
 
@@ -173,31 +199,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IdentityManagementType, Attributes, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>instances_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -206,6 +238,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>instance</code>.
 ```sql
 SELECT
@@ -223,6 +264,19 @@ tags
 FROM awscc.connect.instances
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>instances</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.connect.instances_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -315,6 +369,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.instances
+SET data__PatchDocument = string('{{ {
+    "Attributes": attributes,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/instances_list_only/index.md b/website/docs/services/connect/instances_list_only/index.md
deleted file mode 100644
index d90b56a97..000000000
--- a/website/docs/services/connect/instances_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: instances_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - instances_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>instances</code> in a region or regions, for all properties use <a href="/services/connect/instances/"><code>instances</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>instances_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::Instance</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.instances_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "An instanceArn is automatically generated on creation based on instanceId."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>instances</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.connect.instances_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>instances_list_only</code> resource, see <a href="/services/connect/instances/#permissions"><code>instances</code></a>
-
diff --git a/website/docs/services/connect/integration_associations/index.md b/website/docs/services/connect/integration_associations/index.md
index a26ad7520..4b9bbf9c8 100644
--- a/website/docs/services/connect/integration_associations/index.md
+++ b/website/docs/services/connect/integration_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>integration_association</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "integration_association_id",
@@ -60,6 +69,33 @@ Creates, updates, deletes or gets an <code>integration_association</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "instance_id",
+    "type": "string",
+    "description": "Amazon Connect instance identifier"
+  },
+  {
+    "name": "integration_arn",
+    "type": "string",
+    "description": "ARN of Integration being associated with the instance"
+  },
+  {
+    "name": "integration_type",
+    "type": "string",
+    "description": "Specifies the integration type to be associated with the instance"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-integrationassociation.html"><code>AWS::Connect::IntegrationAssociation</code></a>.
 
@@ -69,26 +105,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>integration_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceId, IntegrationType, IntegrationArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>integration_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>integration_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>integration_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +138,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>integration_association</code>.
 ```sql
 SELECT
@@ -108,6 +158,21 @@ integration_type
 FROM awscc.connect.integration_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<InstanceId>|<IntegrationType>|<IntegrationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>integration_associations</code> in a region.
+```sql
+SELECT
+region,
+instance_id,
+integration_type,
+integration_arn
+FROM awscc.connect.integration_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -180,6 +245,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/integration_associations_list_only/index.md b/website/docs/services/connect/integration_associations_list_only/index.md
deleted file mode 100644
index f55a50d96..000000000
--- a/website/docs/services/connect/integration_associations_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: integration_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - integration_associations_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>integration_associations</code> in a region or regions, for all properties use <a href="/services/connect/integration_associations/"><code>integration_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>integration_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::IntegrationAssociation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.integration_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "instance_id",
-    "type": "string",
-    "description": "Amazon Connect instance identifier"
-  },
-  {
-    "name": "integration_arn",
-    "type": "string",
-    "description": "ARN of Integration being associated with the instance"
-  },
-  {
-    "name": "integration_type",
-    "type": "string",
-    "description": "Specifies the integration type to be associated with the instance"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>integration_associations</code> in a region.
-```sql
-SELECT
-region,
-instance_id,
-integration_type,
-integration_arn
-FROM awscc.connect.integration_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>integration_associations_list_only</code> resource, see <a href="/services/connect/integration_associations/#permissions"><code>integration_associations</code></a>
-
diff --git a/website/docs/services/connect/predefined_attributes/index.md b/website/docs/services/connect/predefined_attributes/index.md
index b7f5bacda..368ef5450 100644
--- a/website/docs/services/connect/predefined_attributes/index.md
+++ b/website/docs/services/connect/predefined_attributes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>predefined_attribute</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -94,6 +103,28 @@ Creates, updates, deletes or gets a <code>predefined_attribute</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "instance_arn",
+    "type": "string",
+    "description": "The identifier of the Amazon Connect instance."
+  },
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the predefined attribute."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-predefinedattribute.html"><code>AWS::Connect::PredefinedAttribute</code></a>.
 
@@ -103,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>predefined_attributes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>predefined_attributes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>predefined_attributes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>predefined_attributes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>predefined_attributes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>predefined_attribute</code>.
 ```sql
 SELECT
@@ -150,6 +196,20 @@ last_modified_time
 FROM awscc.connect.predefined_attributes
 WHERE region = 'us-east-1' AND data__Identifier = '<InstanceArn>|<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>predefined_attributes</code> in a region.
+```sql
+SELECT
+region,
+instance_arn,
+name
+FROM awscc.connect.predefined_attributes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -233,6 +293,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.predefined_attributes
+SET data__PatchDocument = string('{{ {
+    "Values": values,
+    "Purposes": purposes,
+    "AttributeConfiguration": attribute_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InstanceArn>|<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/predefined_attributes_list_only/index.md b/website/docs/services/connect/predefined_attributes_list_only/index.md
deleted file mode 100644
index d9e5546e9..000000000
--- a/website/docs/services/connect/predefined_attributes_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: predefined_attributes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - predefined_attributes_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>predefined_attributes</code> in a region or regions, for all properties use <a href="/services/connect/predefined_attributes/"><code>predefined_attributes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>predefined_attributes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::PredefinedAttribute</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.predefined_attributes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "instance_arn",
-    "type": "string",
-    "description": "The identifier of the Amazon Connect instance."
-  },
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the predefined attribute."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>predefined_attributes</code> in a region.
-```sql
-SELECT
-region,
-instance_arn,
-name
-FROM awscc.connect.predefined_attributes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>predefined_attributes_list_only</code> resource, see <a href="/services/connect/predefined_attributes/#permissions"><code>predefined_attributes</code></a>
-
diff --git a/website/docs/services/connect/prompts/index.md b/website/docs/services/connect/prompts/index.md
index e01b7c37d..4aa030f9d 100644
--- a/website/docs/services/connect/prompts/index.md
+++ b/website/docs/services/connect/prompts/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>prompt</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>prompt</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "prompt_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) for the prompt."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-prompt.html"><code>AWS::Connect::Prompt</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>prompts</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>prompts</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>prompts</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>prompts_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>prompts</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>prompt</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.connect.prompts
 WHERE region = 'us-east-1' AND data__Identifier = '<PromptArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>prompts</code> in a region.
+```sql
+SELECT
+region,
+prompt_arn
+FROM awscc.connect.prompts_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +271,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.prompts
+SET data__PatchDocument = string('{{ {
+    "InstanceArn": instance_arn,
+    "Name": name,
+    "Description": description,
+    "S3Uri": s3_uri,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PromptArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/prompts_list_only/index.md b/website/docs/services/connect/prompts_list_only/index.md
deleted file mode 100644
index b417c6f9b..000000000
--- a/website/docs/services/connect/prompts_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: prompts_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - prompts_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>prompts</code> in a region or regions, for all properties use <a href="/services/connect/prompts/"><code>prompts</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>prompts_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::Prompt</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.prompts_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "prompt_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) for the prompt."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>prompts</code> in a region.
-```sql
-SELECT
-region,
-prompt_arn
-FROM awscc.connect.prompts_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>prompts_list_only</code> resource, see <a href="/services/connect/prompts/#permissions"><code>prompts</code></a>
-
diff --git a/website/docs/services/connect/queues/index.md b/website/docs/services/connect/queues/index.md
index f0f371181..386b7084a 100644
--- a/website/docs/services/connect/queues/index.md
+++ b/website/docs/services/connect/queues/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>queue</code> resource or lists <code>q
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -136,6 +145,23 @@ Creates, updates, deletes or gets a <code>queue</code> resource or lists <code>q
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "queue_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) for the queue."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-queue.html"><code>AWS::Connect::Queue</code></a>.
 
@@ -145,31 +171,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, HoursOfOperationArn, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>queues_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -178,6 +210,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>queue</code>.
 ```sql
 SELECT
@@ -197,6 +238,19 @@ type
 FROM awscc.connect.queues
 WHERE region = 'us-east-1' AND data__Identifier = '<QueueArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>queues</code> in a region.
+```sql
+SELECT
+region,
+queue_arn
+FROM awscc.connect.queues_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -304,6 +358,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.queues
+SET data__PatchDocument = string('{{ {
+    "InstanceArn": instance_arn,
+    "Description": description,
+    "HoursOfOperationArn": hours_of_operation_arn,
+    "MaxContacts": max_contacts,
+    "Name": name,
+    "OutboundCallerConfig": outbound_caller_config,
+    "OutboundEmailConfig": outbound_email_config,
+    "Status": status,
+    "QuickConnectArns": quick_connect_arns,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<QueueArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/queues_list_only/index.md b/website/docs/services/connect/queues_list_only/index.md
deleted file mode 100644
index ead21f282..000000000
--- a/website/docs/services/connect/queues_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: queues_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - queues_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>queues</code> in a region or regions, for all properties use <a href="/services/connect/queues/"><code>queues</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>queues_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::Queue</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.queues_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "queue_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) for the queue."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>queues</code> in a region.
-```sql
-SELECT
-region,
-queue_arn
-FROM awscc.connect.queues_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>queues_list_only</code> resource, see <a href="/services/connect/queues/#permissions"><code>queues</code></a>
-
diff --git a/website/docs/services/connect/quick_connects/index.md b/website/docs/services/connect/quick_connects/index.md
index 916a39959..b206a47ab 100644
--- a/website/docs/services/connect/quick_connects/index.md
+++ b/website/docs/services/connect/quick_connects/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>quick_connect</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -140,6 +149,23 @@ Creates, updates, deletes or gets a <code>quick_connect</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "quick_connect_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) for the quick connect."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-quickconnect.html"><code>AWS::Connect::QuickConnect</code></a>.
 
@@ -149,31 +175,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>quick_connects</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, InstanceArn, QuickConnectConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>quick_connects</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>quick_connects</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>quick_connects_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>quick_connects</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -182,6 +214,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>quick_connect</code>.
 ```sql
 SELECT
@@ -196,6 +237,19 @@ quick_connect_type
 FROM awscc.connect.quick_connects
 WHERE region = 'us-east-1' AND data__Identifier = '<QuickConnectArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>quick_connects</code> in a region.
+```sql
+SELECT
+region,
+quick_connect_arn
+FROM awscc.connect.quick_connects_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -287,6 +341,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.quick_connects
+SET data__PatchDocument = string('{{ {
+    "InstanceArn": instance_arn,
+    "Name": name,
+    "Description": description,
+    "QuickConnectConfig": quick_connect_config,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<QuickConnectArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/quick_connects_list_only/index.md b/website/docs/services/connect/quick_connects_list_only/index.md
deleted file mode 100644
index b76f929c2..000000000
--- a/website/docs/services/connect/quick_connects_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: quick_connects_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - quick_connects_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>quick_connects</code> in a region or regions, for all properties use <a href="/services/connect/quick_connects/"><code>quick_connects</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>quick_connects_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::QuickConnect</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.quick_connects_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "quick_connect_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) for the quick connect."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>quick_connects</code> in a region.
-```sql
-SELECT
-region,
-quick_connect_arn
-FROM awscc.connect.quick_connects_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>quick_connects_list_only</code> resource, see <a href="/services/connect/quick_connects/#permissions"><code>quick_connects</code></a>
-
diff --git a/website/docs/services/connect/routing_profiles/index.md b/website/docs/services/connect/routing_profiles/index.md
index 52564d430..4eadbac01 100644
--- a/website/docs/services/connect/routing_profiles/index.md
+++ b/website/docs/services/connect/routing_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>routing_profile</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -150,6 +159,23 @@ Creates, updates, deletes or gets a <code>routing_profile</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "routing_profile_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the routing profile."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-routingprofile.html"><code>AWS::Connect::RoutingProfile</code></a>.
 
@@ -159,31 +185,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>routing_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, Name, Description, MediaConcurrencies, DefaultOutboundQueueArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>routing_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>routing_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>routing_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>routing_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -192,6 +224,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>routing_profile</code>.
 ```sql
 SELECT
@@ -208,6 +249,19 @@ agent_availability_timer
 FROM awscc.connect.routing_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<RoutingProfileArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>routing_profiles</code> in a region.
+```sql
+SELECT
+region,
+routing_profile_arn
+FROM awscc.connect.routing_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -315,6 +369,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.routing_profiles
+SET data__PatchDocument = string('{{ {
+    "InstanceArn": instance_arn,
+    "Name": name,
+    "Description": description,
+    "MediaConcurrencies": media_concurrencies,
+    "DefaultOutboundQueueArn": default_outbound_queue_arn,
+    "QueueConfigs": queue_configs,
+    "Tags": tags,
+    "AgentAvailabilityTimer": agent_availability_timer
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RoutingProfileArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/routing_profiles_list_only/index.md b/website/docs/services/connect/routing_profiles_list_only/index.md
deleted file mode 100644
index 350fc1d4c..000000000
--- a/website/docs/services/connect/routing_profiles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: routing_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - routing_profiles_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>routing_profiles</code> in a region or regions, for all properties use <a href="/services/connect/routing_profiles/"><code>routing_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>routing_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::RoutingProfile</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.routing_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "routing_profile_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the routing profile."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>routing_profiles</code> in a region.
-```sql
-SELECT
-region,
-routing_profile_arn
-FROM awscc.connect.routing_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>routing_profiles_list_only</code> resource, see <a href="/services/connect/routing_profiles/#permissions"><code>routing_profiles</code></a>
-
diff --git a/website/docs/services/connect/rules/index.md b/website/docs/services/connect/rules/index.md
index 69971a7b1..37b6188be 100644
--- a/website/docs/services/connect/rules/index.md
+++ b/website/docs/services/connect/rules/index.md
@@ -467,6 +467,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.rules
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Function": function,
+    "Actions": actions,
+    "PublishStatus": publish_status,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RuleArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/security_keys/index.md b/website/docs/services/connect/security_keys/index.md
index f6d090480..ffd9ecca7 100644
--- a/website/docs/services/connect/security_keys/index.md
+++ b/website/docs/services/connect/security_keys/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>security_key</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "key",
@@ -55,6 +64,28 @@ Creates, updates, deletes or gets a <code>security_key</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "instance_id",
+    "type": "string",
+    "description": "Amazon Connect instance identifier"
+  },
+  {
+    "name": "association_id",
+    "type": "string",
+    "description": "An associationID is automatically generated when a storage config is associated with an instance"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-securitykey.html"><code>AWS::Connect::SecurityKey</code></a>.
 
@@ -64,26 +95,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>security_keys</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Key, InstanceId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>security_keys</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>security_keys_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>security_keys</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +128,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>security_key</code>.
 ```sql
 SELECT
@@ -102,6 +147,20 @@ association_id
 FROM awscc.connect.security_keys
 WHERE region = 'us-east-1' AND data__Identifier = '<InstanceId>|<AssociationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>security_keys</code> in a region.
+```sql
+SELECT
+region,
+instance_id,
+association_id
+FROM awscc.connect.security_keys_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -168,6 +227,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/security_keys_list_only/index.md b/website/docs/services/connect/security_keys_list_only/index.md
deleted file mode 100644
index cc256125e..000000000
--- a/website/docs/services/connect/security_keys_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: security_keys_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - security_keys_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>security_keys</code> in a region or regions, for all properties use <a href="/services/connect/security_keys/"><code>security_keys</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>security_keys_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::SecurityKey</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.security_keys_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "instance_id",
-    "type": "string",
-    "description": "Amazon Connect instance identifier"
-  },
-  {
-    "name": "association_id",
-    "type": "string",
-    "description": "An associationID is automatically generated when a storage config is associated with an instance"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>security_keys</code> in a region.
-```sql
-SELECT
-region,
-instance_id,
-association_id
-FROM awscc.connect.security_keys_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>security_keys_list_only</code> resource, see <a href="/services/connect/security_keys/#permissions"><code>security_keys</code></a>
-
diff --git a/website/docs/services/connect/security_profiles/index.md b/website/docs/services/connect/security_profiles/index.md
index a31ef072c..69e06cbe9 100644
--- a/website/docs/services/connect/security_profiles/index.md
+++ b/website/docs/services/connect/security_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>security_profile</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "allowed_access_control_tags",
@@ -129,6 +138,23 @@ Creates, updates, deletes or gets a <code>security_profile</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "security_profile_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) for the security profile."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-securityprofile.html"><code>AWS::Connect::SecurityProfile</code></a>.
 
@@ -138,31 +164,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>security_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, SecurityProfileName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>security_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>security_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>security_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>security_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -171,6 +203,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>security_profile</code>.
 ```sql
 SELECT
@@ -191,6 +232,19 @@ last_modified_time
 FROM awscc.connect.security_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<SecurityProfileArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>security_profiles</code> in a region.
+```sql
+SELECT
+region,
+security_profile_arn
+FROM awscc.connect.security_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -298,6 +352,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.security_profiles
+SET data__PatchDocument = string('{{ {
+    "AllowedAccessControlTags": allowed_access_control_tags,
+    "Description": description,
+    "Permissions": permissions,
+    "TagRestrictedResources": tag_restricted_resources,
+    "HierarchyRestrictedResources": hierarchy_restricted_resources,
+    "AllowedAccessControlHierarchyGroupId": allowed_access_control_hierarchy_group_id,
+    "Applications": applications,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SecurityProfileArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/security_profiles_list_only/index.md b/website/docs/services/connect/security_profiles_list_only/index.md
deleted file mode 100644
index fee12442e..000000000
--- a/website/docs/services/connect/security_profiles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: security_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - security_profiles_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>security_profiles</code> in a region or regions, for all properties use <a href="/services/connect/security_profiles/"><code>security_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>security_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::SecurityProfile</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.security_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "security_profile_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) for the security profile."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>security_profiles</code> in a region.
-```sql
-SELECT
-region,
-security_profile_arn
-FROM awscc.connect.security_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>security_profiles_list_only</code> resource, see <a href="/services/connect/security_profiles/#permissions"><code>security_profiles</code></a>
-
diff --git a/website/docs/services/connect/task_templates/index.md b/website/docs/services/connect/task_templates/index.md
index 28ad689df..52faf19f5 100644
--- a/website/docs/services/connect/task_templates/index.md
+++ b/website/docs/services/connect/task_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>task_template</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -219,6 +228,23 @@ Creates, updates, deletes or gets a <code>task_template</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The identifier (arn) of the task template."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-tasktemplate.html"><code>AWS::Connect::TaskTemplate</code></a>.
 
@@ -228,31 +254,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>task_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>task_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>task_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>task_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>task_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -261,6 +293,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>task_template</code>.
 ```sql
 SELECT
@@ -280,6 +321,19 @@ tags
 FROM awscc.connect.task_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>task_templates</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.connect.task_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -396,6 +450,29 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.task_templates
+SET data__PatchDocument = string('{{ {
+    "InstanceArn": instance_arn,
+    "Name": name,
+    "Description": description,
+    "ContactFlowArn": contact_flow_arn,
+    "SelfAssignContactFlowArn": self_assign_contact_flow_arn,
+    "Constraints": constraints,
+    "Defaults": defaults,
+    "Fields": fields,
+    "Status": status,
+    "ClientToken": client_token,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/task_templates_list_only/index.md b/website/docs/services/connect/task_templates_list_only/index.md
deleted file mode 100644
index 2369afdca..000000000
--- a/website/docs/services/connect/task_templates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: task_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - task_templates_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>task_templates</code> in a region or regions, for all properties use <a href="/services/connect/task_templates/"><code>task_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>task_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::TaskTemplate.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.task_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The identifier (arn) of the task template."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>task_templates</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.connect.task_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>task_templates_list_only</code> resource, see <a href="/services/connect/task_templates/#permissions"><code>task_templates</code></a>
-
diff --git a/website/docs/services/connect/traffic_distribution_groups/index.md b/website/docs/services/connect/traffic_distribution_groups/index.md
index fb6b3ec79..1dbc1e59e 100644
--- a/website/docs/services/connect/traffic_distribution_groups/index.md
+++ b/website/docs/services/connect/traffic_distribution_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>traffic_distribution_group</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>traffic_distribution_group</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "traffic_distribution_group_arn",
+    "type": "string",
+    "description": "The identifier of the traffic distribution group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-trafficdistributiongroup.html"><code>AWS::Connect::TrafficDistributionGroup</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>traffic_distribution_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>traffic_distribution_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>traffic_distribution_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>traffic_distribution_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>traffic_distribution_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>traffic_distribution_group</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ is_default
 FROM awscc.connect.traffic_distribution_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<TrafficDistributionGroupArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>traffic_distribution_groups</code> in a region.
+```sql
+SELECT
+region,
+traffic_distribution_group_arn
+FROM awscc.connect.traffic_distribution_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.traffic_distribution_groups
+SET data__PatchDocument = string('{{ {
+    "InstanceArn": instance_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TrafficDistributionGroupArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/traffic_distribution_groups_list_only/index.md b/website/docs/services/connect/traffic_distribution_groups_list_only/index.md
deleted file mode 100644
index d44c83b28..000000000
--- a/website/docs/services/connect/traffic_distribution_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: traffic_distribution_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - traffic_distribution_groups_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>traffic_distribution_groups</code> in a region or regions, for all properties use <a href="/services/connect/traffic_distribution_groups/"><code>traffic_distribution_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>traffic_distribution_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::TrafficDistributionGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.traffic_distribution_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "traffic_distribution_group_arn",
-    "type": "string",
-    "description": "The identifier of the traffic distribution group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>traffic_distribution_groups</code> in a region.
-```sql
-SELECT
-region,
-traffic_distribution_group_arn
-FROM awscc.connect.traffic_distribution_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>traffic_distribution_groups_list_only</code> resource, see <a href="/services/connect/traffic_distribution_groups/#permissions"><code>traffic_distribution_groups</code></a>
-
diff --git a/website/docs/services/connect/user_hierarchy_groups/index.md b/website/docs/services/connect/user_hierarchy_groups/index.md
index 5189fedbc..f375664b0 100644
--- a/website/docs/services/connect/user_hierarchy_groups/index.md
+++ b/website/docs/services/connect/user_hierarchy_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>user_hierarchy_group</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets an <code>user_hierarchy_group</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "user_hierarchy_group_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) for the user hierarchy group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-userhierarchygroup.html"><code>AWS::Connect::UserHierarchyGroup</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>user_hierarchy_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, InstanceArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>user_hierarchy_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>user_hierarchy_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>user_hierarchy_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>user_hierarchy_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user_hierarchy_group</code>.
 ```sql
 SELECT
@@ -126,6 +167,19 @@ tags
 FROM awscc.connect.user_hierarchy_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<UserHierarchyGroupArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>user_hierarchy_groups</code> in a region.
+```sql
+SELECT
+region,
+user_hierarchy_group_arn
+FROM awscc.connect.user_hierarchy_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -202,6 +256,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.user_hierarchy_groups
+SET data__PatchDocument = string('{{ {
+    "InstanceArn": instance_arn,
+    "Name": name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserHierarchyGroupArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/user_hierarchy_groups_list_only/index.md b/website/docs/services/connect/user_hierarchy_groups_list_only/index.md
deleted file mode 100644
index 769db1d45..000000000
--- a/website/docs/services/connect/user_hierarchy_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: user_hierarchy_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - user_hierarchy_groups_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>user_hierarchy_groups</code> in a region or regions, for all properties use <a href="/services/connect/user_hierarchy_groups/"><code>user_hierarchy_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>user_hierarchy_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::UserHierarchyGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.user_hierarchy_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "user_hierarchy_group_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) for the user hierarchy group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>user_hierarchy_groups</code> in a region.
-```sql
-SELECT
-region,
-user_hierarchy_group_arn
-FROM awscc.connect.user_hierarchy_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>user_hierarchy_groups_list_only</code> resource, see <a href="/services/connect/user_hierarchy_groups/#permissions"><code>user_hierarchy_groups</code></a>
-
diff --git a/website/docs/services/connect/user_hierarchy_structures/index.md b/website/docs/services/connect/user_hierarchy_structures/index.md
index e7acae648..8a22f317a 100644
--- a/website/docs/services/connect/user_hierarchy_structures/index.md
+++ b/website/docs/services/connect/user_hierarchy_structures/index.md
@@ -298,6 +298,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.user_hierarchy_structures
+SET data__PatchDocument = string('{{ {
+    "UserHierarchyStructure": user_hierarchy_structure
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserHierarchyStructureArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/users/index.md b/website/docs/services/connect/users/index.md
index a3f8a766e..794882615 100644
--- a/website/docs/services/connect/users/index.md
+++ b/website/docs/services/connect/users/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>user</code> resource or lists <code>us
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -183,6 +192,23 @@ Creates, updates, deletes or gets a <code>user</code> resource or lists <code>us
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "user_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) for the user."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-user.html"><code>AWS::Connect::User</code></a>.
 
@@ -192,31 +218,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>users</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, PhoneConfig, RoutingProfileArn, SecurityProfileArns, Username, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>users</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>users</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>users_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>users</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -225,6 +257,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user</code>.
 ```sql
 SELECT
@@ -244,6 +285,19 @@ user_proficiencies
 FROM awscc.connect.users
 WHERE region = 'us-east-1' AND data__Identifier = '<UserArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>users</code> in a region.
+```sql
+SELECT
+region,
+user_arn
+FROM awscc.connect.users_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -368,6 +422,29 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.users
+SET data__PatchDocument = string('{{ {
+    "InstanceArn": instance_arn,
+    "DirectoryUserId": directory_user_id,
+    "HierarchyGroupArn": hierarchy_group_arn,
+    "Username": username,
+    "Password": password,
+    "RoutingProfileArn": routing_profile_arn,
+    "IdentityInfo": identity_info,
+    "PhoneConfig": phone_config,
+    "SecurityProfileArns": security_profile_arns,
+    "Tags": tags,
+    "UserProficiencies": user_proficiencies
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/users_list_only/index.md b/website/docs/services/connect/users_list_only/index.md
deleted file mode 100644
index f2e1e921a..000000000
--- a/website/docs/services/connect/users_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: users_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - users_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>users</code> in a region or regions, for all properties use <a href="/services/connect/users/"><code>users</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>users_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::User</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.users_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "user_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) for the user."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>users</code> in a region.
-```sql
-SELECT
-region,
-user_arn
-FROM awscc.connect.users_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>users_list_only</code> resource, see <a href="/services/connect/users/#permissions"><code>users</code></a>
-
diff --git a/website/docs/services/connect/view_versions/index.md b/website/docs/services/connect/view_versions/index.md
index 0dfc356be..989bbc6c1 100644
--- a/website/docs/services/connect/view_versions/index.md
+++ b/website/docs/services/connect/view_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>view_version</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "view_arn",
@@ -65,6 +74,28 @@ Creates, updates, deletes or gets a <code>view_version</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "view_version_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the created view version."
+  },
+  {
+    "name": "version",
+    "type": "integer",
+    "description": "The version of the view."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-viewversion.html"><code>AWS::Connect::ViewVersion</code></a>.
 
@@ -74,26 +105,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>view_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ViewArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>view_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>view_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>view_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +138,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>view_version</code>.
 ```sql
 SELECT
@@ -114,6 +159,19 @@ version
 FROM awscc.connect.view_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<ViewVersionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>view_versions</code> in a region.
+```sql
+SELECT
+region,
+view_version_arn
+FROM awscc.connect.view_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -182,6 +240,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/view_versions_list_only/index.md b/website/docs/services/connect/view_versions_list_only/index.md
deleted file mode 100644
index 5ebc5d4af..000000000
--- a/website/docs/services/connect/view_versions_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: view_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - view_versions_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>view_versions</code> in a region or regions, for all properties use <a href="/services/connect/view_versions/"><code>view_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>view_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::ViewVersion</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.view_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "view_version_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the created view version."
-  },
-  {
-    "name": "version",
-    "type": "integer",
-    "description": "The version of the view."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>view_versions</code> in a region.
-```sql
-SELECT
-region,
-view_version_arn
-FROM awscc.connect.view_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>view_versions_list_only</code> resource, see <a href="/services/connect/view_versions/#permissions"><code>view_versions</code></a>
-
diff --git a/website/docs/services/connect/views/index.md b/website/docs/services/connect/views/index.md
index 3dbcfa0d2..890fe15c8 100644
--- a/website/docs/services/connect/views/index.md
+++ b/website/docs/services/connect/views/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>view</code> resource or lists <code>vi
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>view</code> resource or lists <code>vi
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "view_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the view."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-view.html"><code>AWS::Connect::View</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>views</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, Template, Actions, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>views</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>views</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>views_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>views</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>view</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ tags
 FROM awscc.connect.views
 WHERE region = 'us-east-1' AND data__Identifier = '<ViewArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>views</code> in a region.
+```sql
+SELECT
+region,
+view_arn
+FROM awscc.connect.views_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -244,6 +298,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connect.views
+SET data__PatchDocument = string('{{ {
+    "InstanceArn": instance_arn,
+    "Name": name,
+    "Description": description,
+    "Template": template,
+    "Actions": actions,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ViewArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connect/views_list_only/index.md b/website/docs/services/connect/views_list_only/index.md
deleted file mode 100644
index 7cf7c1df2..000000000
--- a/website/docs/services/connect/views_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: views_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - views_list_only
-  - connect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>views</code> in a region or regions, for all properties use <a href="/services/connect/views/"><code>views</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>views_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::View</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.views_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "view_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the view."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>views</code> in a region.
-```sql
-SELECT
-region,
-view_arn
-FROM awscc.connect.views_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>views_list_only</code> resource, see <a href="/services/connect/views/#permissions"><code>views</code></a>
-
diff --git a/website/docs/services/connectcampaigns/campaigns/index.md b/website/docs/services/connectcampaigns/campaigns/index.md
index 18d435773..aacd71b01 100644
--- a/website/docs/services/connectcampaigns/campaigns/index.md
+++ b/website/docs/services/connectcampaigns/campaigns/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>campaign</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "connect_instance_arn",
@@ -164,6 +173,23 @@ Creates, updates, deletes or gets a <code>campaign</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Amazon Connect Campaign Arn"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connectcampaigns-campaign.html"><code>AWS::ConnectCampaigns::Campaign</code></a>.
 
@@ -173,31 +199,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>campaigns</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConnectInstanceArn, DialerConfig, Name, OutboundCallConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>campaigns</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>campaigns</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>campaigns_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>campaigns</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -206,6 +238,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>campaign</code>.
 ```sql
 SELECT
@@ -219,6 +260,19 @@ tags
 FROM awscc.connectcampaigns.campaigns
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>campaigns</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.connectcampaigns.campaigns_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -317,6 +371,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connectcampaigns.campaigns
+SET data__PatchDocument = string('{{ {
+    "DialerConfig": dialer_config,
+    "Name": name,
+    "OutboundCallConfig": outbound_call_config,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connectcampaigns/campaigns_list_only/index.md b/website/docs/services/connectcampaigns/campaigns_list_only/index.md
deleted file mode 100644
index 9cde1de08..000000000
--- a/website/docs/services/connectcampaigns/campaigns_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: campaigns_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - campaigns_list_only
-  - connectcampaigns
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>campaigns</code> in a region or regions, for all properties use <a href="/services/connectcampaigns/campaigns/"><code>campaigns</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>campaigns_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::ConnectCampaigns::Campaign Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connectcampaigns.campaigns_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Amazon Connect Campaign Arn"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>campaigns</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.connectcampaigns.campaigns_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>campaigns_list_only</code> resource, see <a href="/services/connectcampaigns/campaigns/#permissions"><code>campaigns</code></a>
-
diff --git a/website/docs/services/connectcampaigns/index.md b/website/docs/services/connectcampaigns/index.md
index 463161e11..8377be3f6 100644
--- a/website/docs/services/connectcampaigns/index.md
+++ b/website/docs/services/connectcampaigns/index.md
@@ -20,7 +20,7 @@ The connectcampaigns service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The connectcampaigns service documentation.
 <a href="/services/connectcampaigns/campaigns/">campaigns</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/connectcampaigns/campaigns_list_only/">campaigns_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/connectcampaignsv2/campaigns/index.md b/website/docs/services/connectcampaignsv2/campaigns/index.md
index 0ca495564..807ce7938 100644
--- a/website/docs/services/connectcampaignsv2/campaigns/index.md
+++ b/website/docs/services/connectcampaignsv2/campaigns/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>campaign</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -357,6 +366,23 @@ Creates, updates, deletes or gets a <code>campaign</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Amazon Connect Campaign Arn"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connectcampaignsv2-campaign.html"><code>AWS::ConnectCampaignsV2::Campaign</code></a>.
 
@@ -366,31 +392,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>campaigns</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, ConnectInstanceId, ChannelSubtypeConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>campaigns</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>campaigns</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>campaigns_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>campaigns</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -399,6 +431,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>campaign</code>.
 ```sql
 SELECT
@@ -416,6 +457,19 @@ tags
 FROM awscc.connectcampaignsv2.campaigns
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>campaigns</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.connectcampaignsv2.campaigns_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -574,6 +628,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.connectcampaignsv2.campaigns
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "ChannelSubtypeConfig": channel_subtype_config,
+    "Source": source,
+    "ConnectCampaignFlowArn": connect_campaign_flow_arn,
+    "Schedule": schedule,
+    "CommunicationTimeConfig": communication_time_config,
+    "CommunicationLimitsOverride": communication_limits_override,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/connectcampaignsv2/campaigns_list_only/index.md b/website/docs/services/connectcampaignsv2/campaigns_list_only/index.md
deleted file mode 100644
index dad3302c5..000000000
--- a/website/docs/services/connectcampaignsv2/campaigns_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: campaigns_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - campaigns_list_only
-  - connectcampaignsv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>campaigns</code> in a region or regions, for all properties use <a href="/services/connectcampaignsv2/campaigns/"><code>campaigns</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>campaigns_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::ConnectCampaignsV2::Campaign Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connectcampaignsv2.campaigns_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Amazon Connect Campaign Arn"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>campaigns</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.connectcampaignsv2.campaigns_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>campaigns_list_only</code> resource, see <a href="/services/connectcampaignsv2/campaigns/#permissions"><code>campaigns</code></a>
-
diff --git a/website/docs/services/connectcampaignsv2/index.md b/website/docs/services/connectcampaignsv2/index.md
index 35294b349..bc3a9f0f2 100644
--- a/website/docs/services/connectcampaignsv2/index.md
+++ b/website/docs/services/connectcampaignsv2/index.md
@@ -20,7 +20,7 @@ The connectcampaignsv2 service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The connectcampaignsv2 service documentation.
 <a href="/services/connectcampaignsv2/campaigns/">campaigns</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/connectcampaignsv2/campaigns_list_only/">campaigns_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/controltower/enabled_baselines/index.md b/website/docs/services/controltower/enabled_baselines/index.md
index d6844ce4f..14168ab58 100644
--- a/website/docs/services/controltower/enabled_baselines/index.md
+++ b/website/docs/services/controltower/enabled_baselines/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>enabled_baseline</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "baseline_identifier",
@@ -94,6 +103,28 @@ Creates, updates, deletes or gets an <code>enabled_baseline</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "baseline_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "enabled_baseline_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-controltower-enabledbaseline.html"><code>AWS::ControlTower::EnabledBaseline</code></a>.
 
@@ -103,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>enabled_baselines</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="BaselineIdentifier, TargetIdentifier, BaselineVersion, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>enabled_baselines</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>enabled_baselines</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>enabled_baselines_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>enabled_baselines</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>enabled_baseline</code>.
 ```sql
 SELECT
@@ -149,6 +195,19 @@ tags
 FROM awscc.controltower.enabled_baselines
 WHERE region = 'us-east-1' AND data__Identifier = '<EnabledBaselineIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>enabled_baselines</code> in a region.
+```sql
+SELECT
+region,
+enabled_baseline_identifier
+FROM awscc.controltower.enabled_baselines_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -233,6 +292,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.controltower.enabled_baselines
+SET data__PatchDocument = string('{{ {
+    "BaselineVersion": baseline_version,
+    "Parameters": parameters,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<EnabledBaselineIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/controltower/enabled_baselines_list_only/index.md b/website/docs/services/controltower/enabled_baselines_list_only/index.md
deleted file mode 100644
index 36e012454..000000000
--- a/website/docs/services/controltower/enabled_baselines_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: enabled_baselines_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - enabled_baselines_list_only
-  - controltower
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>enabled_baselines</code> in a region or regions, for all properties use <a href="/services/controltower/enabled_baselines/"><code>enabled_baselines</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>enabled_baselines_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::ControlTower::EnabledBaseline Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.controltower.enabled_baselines_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "baseline_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "enabled_baseline_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>enabled_baselines</code> in a region.
-```sql
-SELECT
-region,
-enabled_baseline_identifier
-FROM awscc.controltower.enabled_baselines_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>enabled_baselines_list_only</code> resource, see <a href="/services/controltower/enabled_baselines/#permissions"><code>enabled_baselines</code></a>
-
diff --git a/website/docs/services/controltower/enabled_controls/index.md b/website/docs/services/controltower/enabled_controls/index.md
index 888af55d8..bac7e43f1 100644
--- a/website/docs/services/controltower/enabled_controls/index.md
+++ b/website/docs/services/controltower/enabled_controls/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>enabled_control</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "control_identifier",
@@ -84,6 +93,28 @@ Creates, updates, deletes or gets an <code>enabled_control</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "control_identifier",
+    "type": "string",
+    "description": "Arn of the control."
+  },
+  {
+    "name": "target_identifier",
+    "type": "string",
+    "description": "Arn for Organizational unit to which the control needs to be applied"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-controltower-enabledcontrol.html"><code>AWS::ControlTower::EnabledControl</code></a>.
 
@@ -93,31 +124,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>enabled_controls</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TargetIdentifier, ControlIdentifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>enabled_controls</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>enabled_controls</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>enabled_controls_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>enabled_controls</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -126,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>enabled_control</code>.
 ```sql
 SELECT
@@ -137,6 +183,20 @@ tags
 FROM awscc.controltower.enabled_controls
 WHERE region = 'us-east-1' AND data__Identifier = '<TargetIdentifier>|<ControlIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>enabled_controls</code> in a region.
+```sql
+SELECT
+region,
+target_identifier,
+control_identifier
+FROM awscc.controltower.enabled_controls_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -215,6 +275,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.controltower.enabled_controls
+SET data__PatchDocument = string('{{ {
+    "Parameters": parameters,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TargetIdentifier>|<ControlIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/controltower/enabled_controls_list_only/index.md b/website/docs/services/controltower/enabled_controls_list_only/index.md
deleted file mode 100644
index 6547269aa..000000000
--- a/website/docs/services/controltower/enabled_controls_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: enabled_controls_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - enabled_controls_list_only
-  - controltower
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>enabled_controls</code> in a region or regions, for all properties use <a href="/services/controltower/enabled_controls/"><code>enabled_controls</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>enabled_controls_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Enables a control on a specified target.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.controltower.enabled_controls_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "control_identifier",
-    "type": "string",
-    "description": "Arn of the control."
-  },
-  {
-    "name": "target_identifier",
-    "type": "string",
-    "description": "Arn for Organizational unit to which the control needs to be applied"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>enabled_controls</code> in a region.
-```sql
-SELECT
-region,
-target_identifier,
-control_identifier
-FROM awscc.controltower.enabled_controls_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>enabled_controls_list_only</code> resource, see <a href="/services/controltower/enabled_controls/#permissions"><code>enabled_controls</code></a>
-
diff --git a/website/docs/services/controltower/index.md b/website/docs/services/controltower/index.md
index 2a1ffde32..9dcc55e14 100644
--- a/website/docs/services/controltower/index.md
+++ b/website/docs/services/controltower/index.md
@@ -20,7 +20,7 @@ The controltower service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The controltower service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/controltower/enabled_baselines/">enabled_baselines</a><br />
-<a href="/services/controltower/enabled_baselines_list_only/">enabled_baselines_list_only</a><br />
 <a href="/services/controltower/enabled_controls/">enabled_controls</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/controltower/enabled_controls_list_only/">enabled_controls_list_only</a><br />
-<a href="/services/controltower/landing_zones/">landing_zones</a><br />
-<a href="/services/controltower/landing_zones_list_only/">landing_zones_list_only</a>
+<a href="/services/controltower/landing_zones/">landing_zones</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/controltower/landing_zones/index.md b/website/docs/services/controltower/landing_zones/index.md
index ac697b437..393b0a258 100644
--- a/website/docs/services/controltower/landing_zones/index.md
+++ b/website/docs/services/controltower/landing_zones/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>landing_zone</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "status",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>landing_zone</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "landing_zone_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-controltower-landingzone.html"><code>AWS::ControlTower::LandingZone</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>landing_zones</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Manifest, Version, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>landing_zones</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>landing_zones</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>landing_zones_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>landing_zones</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>landing_zone</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.controltower.landing_zones
 WHERE region = 'us-east-1' AND data__Identifier = '<LandingZoneIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>landing_zones</code> in a region.
+```sql
+SELECT
+region,
+landing_zone_identifier
+FROM awscc.controltower.landing_zones_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -221,6 +275,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.controltower.landing_zones
+SET data__PatchDocument = string('{{ {
+    "Version": version,
+    "Manifest": manifest,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LandingZoneIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/controltower/landing_zones_list_only/index.md b/website/docs/services/controltower/landing_zones_list_only/index.md
deleted file mode 100644
index 6f376afb8..000000000
--- a/website/docs/services/controltower/landing_zones_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: landing_zones_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - landing_zones_list_only
-  - controltower
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>landing_zones</code> in a region or regions, for all properties use <a href="/services/controltower/landing_zones/"><code>landing_zones</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>landing_zones_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::ControlTower::LandingZone Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.controltower.landing_zones_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "landing_zone_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>landing_zones</code> in a region.
-```sql
-SELECT
-region,
-landing_zone_identifier
-FROM awscc.controltower.landing_zones_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>landing_zones_list_only</code> resource, see <a href="/services/controltower/landing_zones/#permissions"><code>landing_zones</code></a>
-
diff --git a/website/docs/services/cur/index.md b/website/docs/services/cur/index.md
index c8d160d56..840c505d0 100644
--- a/website/docs/services/cur/index.md
+++ b/website/docs/services/cur/index.md
@@ -20,7 +20,7 @@ The cur service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The cur service documentation.
 <a href="/services/cur/report_definitions/">report_definitions</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/cur/report_definitions_list_only/">report_definitions_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/cur/report_definitions/index.md b/website/docs/services/cur/report_definitions/index.md
index d8a14fcdb..1976fba2b 100644
--- a/website/docs/services/cur/report_definitions/index.md
+++ b/website/docs/services/cur/report_definitions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>report_definition</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "report_name",
@@ -100,6 +109,23 @@ Creates, updates, deletes or gets a <code>report_definition</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "report_name",
+    "type": "string",
+    "description": "The name of the report that you want to create. The name must be unique, is case sensitive, and can't include spaces."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html"><code>AWS::CUR::ReportDefinition</code></a>.
 
@@ -109,31 +135,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>report_definitions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ReportName, TimeUnit, Format, Compression, S3Bucket, S3Prefix, S3Region, RefreshClosedReports, ReportVersioning, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>report_definitions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>report_definitions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>report_definitions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>report_definitions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -142,6 +174,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>report_definition</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ billing_view_arn
 FROM awscc.cur.report_definitions
 WHERE region = 'us-east-1' AND data__Identifier = '<ReportName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>report_definitions</code> in a region.
+```sql
+SELECT
+region,
+report_name
+FROM awscc.cur.report_definitions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -283,6 +337,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.cur.report_definitions
+SET data__PatchDocument = string('{{ {
+    "Format": format,
+    "Compression": compression,
+    "S3Bucket": s3_bucket,
+    "S3Prefix": s3_prefix,
+    "S3Region": s3_region,
+    "AdditionalArtifacts": additional_artifacts,
+    "RefreshClosedReports": refresh_closed_reports
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ReportName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/cur/report_definitions_list_only/index.md b/website/docs/services/cur/report_definitions_list_only/index.md
deleted file mode 100644
index 6a8250f27..000000000
--- a/website/docs/services/cur/report_definitions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: report_definitions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - report_definitions_list_only
-  - cur
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>report_definitions</code> in a region or regions, for all properties use <a href="/services/cur/report_definitions/"><code>report_definitions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>report_definitions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::CUR::ReportDefinition resource creates a Cost & Usage Report with user-defined settings. You can use this resource to define settings like time granularity (hourly, daily, monthly), file format (Parquet, CSV), and S3 bucket for delivery of these reports.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.cur.report_definitions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "report_name",
-    "type": "string",
-    "description": "The name of the report that you want to create. The name must be unique, is case sensitive, and can't include spaces."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>report_definitions</code> in a region.
-```sql
-SELECT
-region,
-report_name
-FROM awscc.cur.report_definitions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>report_definitions_list_only</code> resource, see <a href="/services/cur/report_definitions/#permissions"><code>report_definitions</code></a>
-
diff --git a/website/docs/services/customerprofiles/calculated_attribute_definitions/index.md b/website/docs/services/customerprofiles/calculated_attribute_definitions/index.md
index 2f341748e..dca85934c 100644
--- a/website/docs/services/customerprofiles/calculated_attribute_definitions/index.md
+++ b/website/docs/services/customerprofiles/calculated_attribute_definitions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>calculated_attribute_definition</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain_name",
@@ -216,6 +225,28 @@ Creates, updates, deletes or gets a <code>calculated_attribute_definition</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_name",
+    "type": "string",
+    "description": "The unique name of the domain."
+  },
+  {
+    "name": "calculated_attribute_name",
+    "type": "string",
+    "description": "The unique name of the calculated attribute."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-calculatedattributedefinition.html"><code>AWS::CustomerProfiles::CalculatedAttributeDefinition</code></a>.
 
@@ -225,31 +256,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>calculated_attribute_definitions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainName, CalculatedAttributeName, AttributeDetails, Statistic, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>calculated_attribute_definitions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>calculated_attribute_definitions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>calculated_attribute_definitions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>calculated_attribute_definitions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -258,6 +295,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>calculated_attribute_definition</code>.
 ```sql
 SELECT
@@ -278,6 +324,20 @@ tags
 FROM awscc.customerprofiles.calculated_attribute_definitions
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainName>|<CalculatedAttributeName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>calculated_attribute_definitions</code> in a region.
+```sql
+SELECT
+region,
+domain_name,
+calculated_attribute_name
+FROM awscc.customerprofiles.calculated_attribute_definitions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -393,6 +453,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.customerprofiles.calculated_attribute_definitions
+SET data__PatchDocument = string('{{ {
+    "DisplayName": display_name,
+    "Description": description,
+    "AttributeDetails": attribute_details,
+    "Statistic": statistic,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainName>|<CalculatedAttributeName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/customerprofiles/calculated_attribute_definitions_list_only/index.md b/website/docs/services/customerprofiles/calculated_attribute_definitions_list_only/index.md
deleted file mode 100644
index 05e7f8997..000000000
--- a/website/docs/services/customerprofiles/calculated_attribute_definitions_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: calculated_attribute_definitions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - calculated_attribute_definitions_list_only
-  - customerprofiles
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>calculated_attribute_definitions</code> in a region or regions, for all properties use <a href="/services/customerprofiles/calculated_attribute_definitions/"><code>calculated_attribute_definitions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>calculated_attribute_definitions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A calculated attribute definition for Customer Profiles</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.customerprofiles.calculated_attribute_definitions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_name",
-    "type": "string",
-    "description": "The unique name of the domain."
-  },
-  {
-    "name": "calculated_attribute_name",
-    "type": "string",
-    "description": "The unique name of the calculated attribute."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>calculated_attribute_definitions</code> in a region.
-```sql
-SELECT
-region,
-domain_name,
-calculated_attribute_name
-FROM awscc.customerprofiles.calculated_attribute_definitions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>calculated_attribute_definitions_list_only</code> resource, see <a href="/services/customerprofiles/calculated_attribute_definitions/#permissions"><code>calculated_attribute_definitions</code></a>
-
diff --git a/website/docs/services/customerprofiles/domains/index.md b/website/docs/services/customerprofiles/domains/index.md
index 7cc99fd04..c4257d807 100644
--- a/website/docs/services/customerprofiles/domains/index.md
+++ b/website/docs/services/customerprofiles/domains/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>domain</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain_name",
@@ -320,6 +329,23 @@ Creates, updates, deletes or gets a <code>domain</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_name",
+    "type": "string",
+    "description": "The unique name of the domain."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-domain.html"><code>AWS::CustomerProfiles::Domain</code></a>.
 
@@ -329,31 +355,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainName, DefaultExpirationDays, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>domains_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -362,6 +394,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>domain</code>.
 ```sql
 SELECT
@@ -379,6 +420,19 @@ last_updated_at
 FROM awscc.customerprofiles.domains
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>domains</code> in a region.
+```sql
+SELECT
+region,
+domain_name
+FROM awscc.customerprofiles.domains_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -501,6 +555,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.customerprofiles.domains
+SET data__PatchDocument = string('{{ {
+    "DeadLetterQueueUrl": dead_letter_queue_url,
+    "DefaultEncryptionKey": default_encryption_key,
+    "DefaultExpirationDays": default_expiration_days,
+    "Matching": matching,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/customerprofiles/domains_list_only/index.md b/website/docs/services/customerprofiles/domains_list_only/index.md
deleted file mode 100644
index 8ae6f5c85..000000000
--- a/website/docs/services/customerprofiles/domains_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: domains_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - domains_list_only
-  - customerprofiles
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>domains</code> in a region or regions, for all properties use <a href="/services/customerprofiles/domains/"><code>domains</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>domains_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A domain defined for 3rd party data source in Profile Service</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.customerprofiles.domains_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_name",
-    "type": "string",
-    "description": "The unique name of the domain."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>domains</code> in a region.
-```sql
-SELECT
-region,
-domain_name
-FROM awscc.customerprofiles.domains_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>domains_list_only</code> resource, see <a href="/services/customerprofiles/domains/#permissions"><code>domains</code></a>
-
diff --git a/website/docs/services/customerprofiles/event_streams/index.md b/website/docs/services/customerprofiles/event_streams/index.md
index c6941fc4b..9086ebf13 100644
--- a/website/docs/services/customerprofiles/event_streams/index.md
+++ b/website/docs/services/customerprofiles/event_streams/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>event_stream</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain_name",
@@ -99,6 +108,28 @@ Creates, updates, deletes or gets an <code>event_stream</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_name",
+    "type": "string",
+    "description": "The unique name of the domain."
+  },
+  {
+    "name": "event_stream_name",
+    "type": "string",
+    "description": "The name of the event stream."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-eventstream.html"><code>AWS::CustomerProfiles::EventStream</code></a>.
 
@@ -108,31 +139,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>event_streams</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainName, EventStreamName, Uri, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>event_streams</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>event_streams</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>event_streams_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>event_streams</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +178,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>event_stream</code>.
 ```sql
 SELECT
@@ -156,6 +202,20 @@ destination_details
 FROM awscc.customerprofiles.event_streams
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainName>|<EventStreamName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>event_streams</code> in a region.
+```sql
+SELECT
+region,
+domain_name,
+event_stream_name
+FROM awscc.customerprofiles.event_streams_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -234,6 +294,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.customerprofiles.event_streams
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainName>|<EventStreamName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/customerprofiles/event_streams_list_only/index.md b/website/docs/services/customerprofiles/event_streams_list_only/index.md
deleted file mode 100644
index a890a9753..000000000
--- a/website/docs/services/customerprofiles/event_streams_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: event_streams_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - event_streams_list_only
-  - customerprofiles
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>event_streams</code> in a region or regions, for all properties use <a href="/services/customerprofiles/event_streams/"><code>event_streams</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>event_streams_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An Event Stream resource of Amazon Connect Customer Profiles</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.customerprofiles.event_streams_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_name",
-    "type": "string",
-    "description": "The unique name of the domain."
-  },
-  {
-    "name": "event_stream_name",
-    "type": "string",
-    "description": "The name of the event stream."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>event_streams</code> in a region.
-```sql
-SELECT
-region,
-domain_name,
-event_stream_name
-FROM awscc.customerprofiles.event_streams_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>event_streams_list_only</code> resource, see <a href="/services/customerprofiles/event_streams/#permissions"><code>event_streams</code></a>
-
diff --git a/website/docs/services/customerprofiles/event_triggers/index.md b/website/docs/services/customerprofiles/event_triggers/index.md
index d45785bd1..899aa39f7 100644
--- a/website/docs/services/customerprofiles/event_triggers/index.md
+++ b/website/docs/services/customerprofiles/event_triggers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>event_trigger</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain_name",
@@ -177,6 +186,28 @@ Creates, updates, deletes or gets an <code>event_trigger</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_name",
+    "type": "string",
+    "description": "The unique name of the domain."
+  },
+  {
+    "name": "event_trigger_name",
+    "type": "string",
+    "description": "The unique name of the event trigger."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-eventtrigger.html"><code>AWS::CustomerProfiles::EventTrigger</code></a>.
 
@@ -186,31 +217,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>event_triggers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainName, EventTriggerName, ObjectTypeName, EventTriggerConditions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>event_triggers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>event_triggers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>event_triggers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>event_triggers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -219,6 +256,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>event_trigger</code>.
 ```sql
 SELECT
@@ -236,6 +282,20 @@ tags
 FROM awscc.customerprofiles.event_triggers
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainName>|<EventTriggerName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>event_triggers</code> in a region.
+```sql
+SELECT
+region,
+domain_name,
+event_trigger_name
+FROM awscc.customerprofiles.event_triggers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -346,6 +406,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.customerprofiles.event_triggers
+SET data__PatchDocument = string('{{ {
+    "ObjectTypeName": object_type_name,
+    "Description": description,
+    "EventTriggerConditions": event_trigger_conditions,
+    "EventTriggerLimits": event_trigger_limits,
+    "SegmentFilter": segment_filter,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainName>|<EventTriggerName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/customerprofiles/event_triggers_list_only/index.md b/website/docs/services/customerprofiles/event_triggers_list_only/index.md
deleted file mode 100644
index 0e59a5c71..000000000
--- a/website/docs/services/customerprofiles/event_triggers_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: event_triggers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - event_triggers_list_only
-  - customerprofiles
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>event_triggers</code> in a region or regions, for all properties use <a href="/services/customerprofiles/event_triggers/"><code>event_triggers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>event_triggers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An event trigger resource of Amazon Connect Customer Profiles</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.customerprofiles.event_triggers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_name",
-    "type": "string",
-    "description": "The unique name of the domain."
-  },
-  {
-    "name": "event_trigger_name",
-    "type": "string",
-    "description": "The unique name of the event trigger."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>event_triggers</code> in a region.
-```sql
-SELECT
-region,
-domain_name,
-event_trigger_name
-FROM awscc.customerprofiles.event_triggers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>event_triggers_list_only</code> resource, see <a href="/services/customerprofiles/event_triggers/#permissions"><code>event_triggers</code></a>
-
diff --git a/website/docs/services/customerprofiles/index.md b/website/docs/services/customerprofiles/index.md
index 83bff0cde..cd5ae55e5 100644
--- a/website/docs/services/customerprofiles/index.md
+++ b/website/docs/services/customerprofiles/index.md
@@ -20,7 +20,7 @@ The customerprofiles service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>14</b></span><br />
+<span>total resources:&nbsp;<b>7</b></span><br />
 </div>
 </div>
 
@@ -30,20 +30,13 @@ The customerprofiles service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/customerprofiles/calculated_attribute_definitions/">calculated_attribute_definitions</a><br />
-<a href="/services/customerprofiles/calculated_attribute_definitions_list_only/">calculated_attribute_definitions_list_only</a><br />
 <a href="/services/customerprofiles/domains/">domains</a><br />
-<a href="/services/customerprofiles/domains_list_only/">domains_list_only</a><br />
 <a href="/services/customerprofiles/event_streams/">event_streams</a><br />
-<a href="/services/customerprofiles/event_streams_list_only/">event_streams_list_only</a><br />
 <a href="/services/customerprofiles/event_triggers/">event_triggers</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/customerprofiles/event_triggers_list_only/">event_triggers_list_only</a><br />
 <a href="/services/customerprofiles/integrations/">integrations</a><br />
-<a href="/services/customerprofiles/integrations_list_only/">integrations_list_only</a><br />
 <a href="/services/customerprofiles/object_types/">object_types</a><br />
-<a href="/services/customerprofiles/object_types_list_only/">object_types_list_only</a><br />
-<a href="/services/customerprofiles/segment_definitions/">segment_definitions</a><br />
-<a href="/services/customerprofiles/segment_definitions_list_only/">segment_definitions_list_only</a>
+<a href="/services/customerprofiles/segment_definitions/">segment_definitions</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/customerprofiles/integrations/index.md b/website/docs/services/customerprofiles/integrations/index.md
index 5c71c187d..da650b8a3 100644
--- a/website/docs/services/customerprofiles/integrations/index.md
+++ b/website/docs/services/customerprofiles/integrations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>integration</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain_name",
@@ -282,6 +291,28 @@ Creates, updates, deletes or gets an <code>integration</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_name",
+    "type": "string",
+    "description": "The unique name of the domain."
+  },
+  {
+    "name": "uri",
+    "type": "string",
+    "description": "The URI of the S3 bucket or any other type of data source."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-integration.html"><code>AWS::CustomerProfiles::Integration</code></a>.
 
@@ -291,31 +322,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>integrations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -324,6 +361,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>integration</code>.
 ```sql
 SELECT
@@ -340,6 +386,20 @@ event_trigger_names
 FROM awscc.customerprofiles.integrations
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainName>|<Uri>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>integrations</code> in a region.
+```sql
+SELECT
+region,
+domain_name,
+uri
+FROM awscc.customerprofiles.integrations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -476,6 +536,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.customerprofiles.integrations
+SET data__PatchDocument = string('{{ {
+    "FlowDefinition": flow_definition,
+    "ObjectTypeName": object_type_name,
+    "Tags": tags,
+    "ObjectTypeNames": object_type_names,
+    "EventTriggerNames": event_trigger_names
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainName>|<Uri>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/customerprofiles/integrations_list_only/index.md b/website/docs/services/customerprofiles/integrations_list_only/index.md
deleted file mode 100644
index 8f91479e1..000000000
--- a/website/docs/services/customerprofiles/integrations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: integrations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - integrations_list_only
-  - customerprofiles
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>integrations</code> in a region or regions, for all properties use <a href="/services/customerprofiles/integrations/"><code>integrations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>integrations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The resource schema for creating an Amazon Connect Customer Profiles Integration.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.customerprofiles.integrations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_name",
-    "type": "string",
-    "description": "The unique name of the domain."
-  },
-  {
-    "name": "uri",
-    "type": "string",
-    "description": "The URI of the S3 bucket or any other type of data source."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>integrations</code> in a region.
-```sql
-SELECT
-region,
-domain_name,
-uri
-FROM awscc.customerprofiles.integrations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>integrations_list_only</code> resource, see <a href="/services/customerprofiles/integrations/#permissions"><code>integrations</code></a>
-
diff --git a/website/docs/services/customerprofiles/object_types/index.md b/website/docs/services/customerprofiles/object_types/index.md
index 5c290c24f..7264b726a 100644
--- a/website/docs/services/customerprofiles/object_types/index.md
+++ b/website/docs/services/customerprofiles/object_types/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>object_type</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain_name",
@@ -180,6 +189,28 @@ Creates, updates, deletes or gets an <code>object_type</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_name",
+    "type": "string",
+    "description": "The unique name of the domain."
+  },
+  {
+    "name": "object_type_name",
+    "type": "string",
+    "description": "The name of the profile object type."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-objecttype.html"><code>AWS::CustomerProfiles::ObjectType</code></a>.
 
@@ -189,31 +220,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>object_types</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainName, ObjectTypeName, Description, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>object_types</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>object_types</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>object_types_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>object_types</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -222,6 +259,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>object_type</code>.
 ```sql
 SELECT
@@ -244,6 +290,20 @@ max_available_profile_object_count
 FROM awscc.customerprofiles.object_types
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainName>|<ObjectTypeName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>object_types</code> in a region.
+```sql
+SELECT
+region,
+domain_name,
+object_type_name
+FROM awscc.customerprofiles.object_types_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -365,6 +425,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.customerprofiles.object_types
+SET data__PatchDocument = string('{{ {
+    "AllowProfileCreation": allow_profile_creation,
+    "Description": description,
+    "EncryptionKey": encryption_key,
+    "ExpirationDays": expiration_days,
+    "Fields": fields,
+    "Keys": keys,
+    "SourceLastUpdatedTimestampFormat": source_last_updated_timestamp_format,
+    "Tags": tags,
+    "TemplateId": template_id,
+    "MaxProfileObjectCount": max_profile_object_count
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainName>|<ObjectTypeName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/customerprofiles/object_types_list_only/index.md b/website/docs/services/customerprofiles/object_types_list_only/index.md
deleted file mode 100644
index 14a620491..000000000
--- a/website/docs/services/customerprofiles/object_types_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: object_types_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - object_types_list_only
-  - customerprofiles
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>object_types</code> in a region or regions, for all properties use <a href="/services/customerprofiles/object_types/"><code>object_types</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>object_types_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An ObjectType resource of Amazon Connect Customer Profiles</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.customerprofiles.object_types_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_name",
-    "type": "string",
-    "description": "The unique name of the domain."
-  },
-  {
-    "name": "object_type_name",
-    "type": "string",
-    "description": "The name of the profile object type."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>object_types</code> in a region.
-```sql
-SELECT
-region,
-domain_name,
-object_type_name
-FROM awscc.customerprofiles.object_types_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>object_types_list_only</code> resource, see <a href="/services/customerprofiles/object_types/#permissions"><code>object_types</code></a>
-
diff --git a/website/docs/services/customerprofiles/segment_definitions/index.md b/website/docs/services/customerprofiles/segment_definitions/index.md
index b4a763b79..29299c486 100644
--- a/website/docs/services/customerprofiles/segment_definitions/index.md
+++ b/website/docs/services/customerprofiles/segment_definitions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>segment_definition</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "created_at",
@@ -128,6 +137,28 @@ Creates, updates, deletes or gets a <code>segment_definition</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_name",
+    "type": "string",
+    "description": "The unique name of the domain."
+  },
+  {
+    "name": "segment_definition_name",
+    "type": "string",
+    "description": "The unique name of the segment definition."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-segmentdefinition.html"><code>AWS::CustomerProfiles::SegmentDefinition</code></a>.
 
@@ -137,31 +168,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>segment_definitions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainName, DisplayName, SegmentDefinitionName, SegmentGroups, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>segment_definitions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>segment_definitions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>segment_definitions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>segment_definitions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -170,6 +207,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>segment_definition</code>.
 ```sql
 SELECT
@@ -185,6 +231,20 @@ tags
 FROM awscc.customerprofiles.segment_definitions
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainName>|<SegmentDefinitionName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>segment_definitions</code> in a region.
+```sql
+SELECT
+region,
+domain_name,
+segment_definition_name
+FROM awscc.customerprofiles.segment_definitions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -281,6 +341,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.customerprofiles.segment_definitions
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainName>|<SegmentDefinitionName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/customerprofiles/segment_definitions_list_only/index.md b/website/docs/services/customerprofiles/segment_definitions_list_only/index.md
deleted file mode 100644
index 019924a9e..000000000
--- a/website/docs/services/customerprofiles/segment_definitions_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: segment_definitions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - segment_definitions_list_only
-  - customerprofiles
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>segment_definitions</code> in a region or regions, for all properties use <a href="/services/customerprofiles/segment_definitions/"><code>segment_definitions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>segment_definitions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A segment definition resource of Amazon Connect Customer Profiles</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.customerprofiles.segment_definitions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_name",
-    "type": "string",
-    "description": "The unique name of the domain."
-  },
-  {
-    "name": "segment_definition_name",
-    "type": "string",
-    "description": "The unique name of the segment definition."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>segment_definitions</code> in a region.
-```sql
-SELECT
-region,
-domain_name,
-segment_definition_name
-FROM awscc.customerprofiles.segment_definitions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>segment_definitions_list_only</code> resource, see <a href="/services/customerprofiles/segment_definitions/#permissions"><code>segment_definitions</code></a>
-
diff --git a/website/docs/services/databrew/datasets/index.md b/website/docs/services/databrew/datasets/index.md
index ebe0fa4a4..0e96d2600 100644
--- a/website/docs/services/databrew/datasets/index.md
+++ b/website/docs/services/databrew/datasets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>dataset</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -302,6 +311,23 @@ Creates, updates, deletes or gets a <code>dataset</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Dataset name"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-dataset.html"><code>AWS::DataBrew::Dataset</code></a>.
 
@@ -311,31 +337,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Input, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>datasets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -344,6 +376,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dataset</code>.
 ```sql
 SELECT
@@ -358,6 +399,19 @@ tags
 FROM awscc.databrew.datasets
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>datasets</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.databrew.datasets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -492,6 +546,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.databrew.datasets
+SET data__PatchDocument = string('{{ {
+    "Format": format,
+    "FormatOptions": format_options,
+    "Input": input,
+    "Source": source,
+    "PathOptions": path_options,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/databrew/datasets_list_only/index.md b/website/docs/services/databrew/datasets_list_only/index.md
deleted file mode 100644
index ce5133f3e..000000000
--- a/website/docs/services/databrew/datasets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: datasets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - datasets_list_only
-  - databrew
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>datasets</code> in a region or regions, for all properties use <a href="/services/databrew/datasets/"><code>datasets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>datasets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataBrew::Dataset.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.databrew.datasets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Dataset name"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>datasets</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.databrew.datasets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>datasets_list_only</code> resource, see <a href="/services/databrew/datasets/#permissions"><code>datasets</code></a>
-
diff --git a/website/docs/services/databrew/index.md b/website/docs/services/databrew/index.md
index 15cd8908e..f8cdda386 100644
--- a/website/docs/services/databrew/index.md
+++ b/website/docs/services/databrew/index.md
@@ -20,7 +20,7 @@ The databrew service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>12</b></span><br />
+<span>total resources:&nbsp;<b>6</b></span><br />
 </div>
 </div>
 
@@ -30,18 +30,12 @@ The databrew service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/databrew/datasets/">datasets</a><br />
-<a href="/services/databrew/datasets_list_only/">datasets_list_only</a><br />
 <a href="/services/databrew/jobs/">jobs</a><br />
-<a href="/services/databrew/jobs_list_only/">jobs_list_only</a><br />
-<a href="/services/databrew/projects/">projects</a><br />
-<a href="/services/databrew/projects_list_only/">projects_list_only</a>
+<a href="/services/databrew/projects/">projects</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/databrew/recipes/">recipes</a><br />
-<a href="/services/databrew/recipes_list_only/">recipes_list_only</a><br />
 <a href="/services/databrew/rulesets/">rulesets</a><br />
-<a href="/services/databrew/rulesets_list_only/">rulesets_list_only</a><br />
-<a href="/services/databrew/schedules/">schedules</a><br />
-<a href="/services/databrew/schedules_list_only/">schedules_list_only</a>
+<a href="/services/databrew/schedules/">schedules</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/databrew/jobs/index.md b/website/docs/services/databrew/jobs/index.md
index 9bf172241..627ca0558 100644
--- a/website/docs/services/databrew/jobs/index.md
+++ b/website/docs/services/databrew/jobs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>job</code> resource or lists <code>job
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "dataset_name",
@@ -526,6 +535,23 @@ Creates, updates, deletes or gets a <code>job</code> resource or lists <code>job
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Job name"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html"><code>AWS::DataBrew::Job</code></a>.
 
@@ -535,31 +561,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>jobs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, RoleArn, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>jobs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>jobs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>jobs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>jobs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -568,6 +600,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>job</code>.
 ```sql
 SELECT
@@ -595,6 +636,19 @@ validation_configurations
 FROM awscc.databrew.jobs
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>jobs</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.databrew.jobs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -799,6 +853,36 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.databrew.jobs
+SET data__PatchDocument = string('{{ {
+    "DatasetName": dataset_name,
+    "EncryptionKeyArn": encryption_key_arn,
+    "EncryptionMode": encryption_mode,
+    "LogSubscription": log_subscription,
+    "MaxCapacity": max_capacity,
+    "MaxRetries": max_retries,
+    "Outputs": outputs,
+    "DataCatalogOutputs": data_catalog_outputs,
+    "DatabaseOutputs": database_outputs,
+    "OutputLocation": output_location,
+    "ProjectName": project_name,
+    "Recipe": recipe,
+    "RoleArn": role_arn,
+    "Tags": tags,
+    "Timeout": timeout,
+    "JobSample": job_sample,
+    "ProfileConfiguration": profile_configuration,
+    "ValidationConfigurations": validation_configurations
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/databrew/jobs_list_only/index.md b/website/docs/services/databrew/jobs_list_only/index.md
deleted file mode 100644
index f15c56535..000000000
--- a/website/docs/services/databrew/jobs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: jobs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - jobs_list_only
-  - databrew
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>jobs</code> in a region or regions, for all properties use <a href="/services/databrew/jobs/"><code>jobs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>jobs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataBrew::Job.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.databrew.jobs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Job name"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>jobs</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.databrew.jobs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>jobs_list_only</code> resource, see <a href="/services/databrew/jobs/#permissions"><code>jobs</code></a>
-
diff --git a/website/docs/services/databrew/projects/index.md b/website/docs/services/databrew/projects/index.md
index 17b3d9da7..ed45a1960 100644
--- a/website/docs/services/databrew/projects/index.md
+++ b/website/docs/services/databrew/projects/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>project</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "dataset_name",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets a <code>project</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Project name"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-project.html"><code>AWS::DataBrew::Project</code></a>.
 
@@ -103,31 +129,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DatasetName, Name, RecipeName, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>projects_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>project</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.databrew.projects
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>projects</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.databrew.projects_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -239,6 +293,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.databrew.projects
+SET data__PatchDocument = string('{{ {
+    "DatasetName": dataset_name,
+    "RecipeName": recipe_name,
+    "RoleArn": role_arn,
+    "Sample": sample,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/databrew/projects_list_only/index.md b/website/docs/services/databrew/projects_list_only/index.md
deleted file mode 100644
index 75e30f6a6..000000000
--- a/website/docs/services/databrew/projects_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: projects_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - projects_list_only
-  - databrew
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>projects</code> in a region or regions, for all properties use <a href="/services/databrew/projects/"><code>projects</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>projects_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataBrew::Project.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.databrew.projects_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Project name"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>projects</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.databrew.projects_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>projects_list_only</code> resource, see <a href="/services/databrew/projects/#permissions"><code>projects</code></a>
-
diff --git a/website/docs/services/databrew/recipes/index.md b/website/docs/services/databrew/recipes/index.md
index 3fcd6143f..c71a2eaa9 100644
--- a/website/docs/services/databrew/recipes/index.md
+++ b/website/docs/services/databrew/recipes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>recipe</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -113,6 +122,23 @@ Creates, updates, deletes or gets a <code>recipe</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Recipe name"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-recipe.html"><code>AWS::DataBrew::Recipe</code></a>.
 
@@ -122,31 +148,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>recipes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Steps, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>recipes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>recipes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>recipes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>recipes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -155,6 +187,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>recipe</code>.
 ```sql
 SELECT
@@ -166,6 +207,19 @@ tags
 FROM awscc.databrew.recipes
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>recipes</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.databrew.recipes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -249,6 +303,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.databrew.recipes
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Steps": steps,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/databrew/recipes_list_only/index.md b/website/docs/services/databrew/recipes_list_only/index.md
deleted file mode 100644
index 1ccd8b31d..000000000
--- a/website/docs/services/databrew/recipes_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: recipes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - recipes_list_only
-  - databrew
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>recipes</code> in a region or regions, for all properties use <a href="/services/databrew/recipes/"><code>recipes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>recipes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataBrew::Recipe.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.databrew.recipes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Recipe name"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>recipes</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.databrew.recipes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>recipes_list_only</code> resource, see <a href="/services/databrew/recipes/#permissions"><code>recipes</code></a>
-
diff --git a/website/docs/services/databrew/rulesets/index.md b/website/docs/services/databrew/rulesets/index.md
index 8cb1f44c2..9909f5da9 100644
--- a/website/docs/services/databrew/rulesets/index.md
+++ b/website/docs/services/databrew/rulesets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>ruleset</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -150,6 +159,23 @@ Creates, updates, deletes or gets a <code>ruleset</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Name of the Ruleset"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-ruleset.html"><code>AWS::DataBrew::Ruleset</code></a>.
 
@@ -159,31 +185,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>rulesets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, TargetArn, Rules, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>rulesets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>rulesets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>rulesets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>rulesets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -192,6 +224,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ruleset</code>.
 ```sql
 SELECT
@@ -204,6 +245,19 @@ tags
 FROM awscc.databrew.rulesets
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>rulesets</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.databrew.rulesets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -299,6 +353,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.databrew.rulesets
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Rules": rules,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/databrew/rulesets_list_only/index.md b/website/docs/services/databrew/rulesets_list_only/index.md
deleted file mode 100644
index 781054012..000000000
--- a/website/docs/services/databrew/rulesets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: rulesets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - rulesets_list_only
-  - databrew
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>rulesets</code> in a region or regions, for all properties use <a href="/services/databrew/rulesets/"><code>rulesets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>rulesets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataBrew::Ruleset.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.databrew.rulesets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Name of the Ruleset"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>rulesets</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.databrew.rulesets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>rulesets_list_only</code> resource, see <a href="/services/databrew/rulesets/#permissions"><code>rulesets</code></a>
-
diff --git a/website/docs/services/databrew/schedules/index.md b/website/docs/services/databrew/schedules/index.md
index 3dfae2d14..1419c4eb5 100644
--- a/website/docs/services/databrew/schedules/index.md
+++ b/website/docs/services/databrew/schedules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>schedule</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "job_names",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>schedule</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Schedule Name"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-schedule.html"><code>AWS::DataBrew::Schedule</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>schedules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, CronExpression, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>schedules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>schedules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>schedules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>schedules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>schedule</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ tags
 FROM awscc.databrew.schedules
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>schedules</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.databrew.schedules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -202,6 +256,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.databrew.schedules
+SET data__PatchDocument = string('{{ {
+    "JobNames": job_names,
+    "CronExpression": cron_expression,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/databrew/schedules_list_only/index.md b/website/docs/services/databrew/schedules_list_only/index.md
deleted file mode 100644
index ca5576416..000000000
--- a/website/docs/services/databrew/schedules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: schedules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - schedules_list_only
-  - databrew
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>schedules</code> in a region or regions, for all properties use <a href="/services/databrew/schedules/"><code>schedules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>schedules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataBrew::Schedule.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.databrew.schedules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Schedule Name"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>schedules</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.databrew.schedules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>schedules_list_only</code> resource, see <a href="/services/databrew/schedules/#permissions"><code>schedules</code></a>
-
diff --git a/website/docs/services/datapipeline/index.md b/website/docs/services/datapipeline/index.md
index 081d36757..2fb12a145 100644
--- a/website/docs/services/datapipeline/index.md
+++ b/website/docs/services/datapipeline/index.md
@@ -20,7 +20,7 @@ The datapipeline service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The datapipeline service documentation.
 <a href="/services/datapipeline/pipelines/">pipelines</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/datapipeline/pipelines_list_only/">pipelines_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/datapipeline/pipelines/index.md b/website/docs/services/datapipeline/pipelines/index.md
index 9c608a15e..96286b1b0 100644
--- a/website/docs/services/datapipeline/pipelines/index.md
+++ b/website/docs/services/datapipeline/pipelines/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>pipeline</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "activate",
@@ -162,6 +171,23 @@ Creates, updates, deletes or gets a <code>pipeline</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "pipeline_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html"><code>AWS::DataPipeline::Pipeline</code></a>.
 
@@ -171,31 +197,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>pipelines_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -204,6 +236,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>pipeline</code>.
 ```sql
 SELECT
@@ -219,6 +260,19 @@ pipeline_id
 FROM awscc.datapipeline.pipelines
 WHERE region = 'us-east-1' AND data__Identifier = '<PipelineId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>pipelines</code> in a region.
+```sql
+SELECT
+region,
+pipeline_id
+FROM awscc.datapipeline.pipelines_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -317,6 +371,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datapipeline.pipelines
+SET data__PatchDocument = string('{{ {
+    "Activate": activate,
+    "ParameterObjects": parameter_objects,
+    "ParameterValues": parameter_values,
+    "PipelineObjects": pipeline_objects,
+    "PipelineTags": pipeline_tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PipelineId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datapipeline/pipelines_list_only/index.md b/website/docs/services/datapipeline/pipelines_list_only/index.md
deleted file mode 100644
index 26214e89a..000000000
--- a/website/docs/services/datapipeline/pipelines_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: pipelines_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - pipelines_list_only
-  - datapipeline
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>pipelines</code> in a region or regions, for all properties use <a href="/services/datapipeline/pipelines/"><code>pipelines</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>pipelines_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An example resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datapipeline.pipelines_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "pipeline_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>pipelines</code> in a region.
-```sql
-SELECT
-region,
-pipeline_id
-FROM awscc.datapipeline.pipelines_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>pipelines_list_only</code> resource, see <a href="/services/datapipeline/pipelines/#permissions"><code>pipelines</code></a>
-
diff --git a/website/docs/services/datasync/agents/index.md b/website/docs/services/datasync/agents/index.md
index a740d47da..b8b8d348a 100644
--- a/website/docs/services/datasync/agents/index.md
+++ b/website/docs/services/datasync/agents/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>agent</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "agent_name",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets an <code>agent</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "agent_arn",
+    "type": "string",
+    "description": "The DataSync Agent ARN."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-agent.html"><code>AWS::DataSync::Agent</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>agents</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>agents</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>agents</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>agents_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>agents</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>agent</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ agent_arn
 FROM awscc.datasync.agents
 WHERE region = 'us-east-1' AND data__Identifier = '<AgentArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>agents</code> in a region.
+```sql
+SELECT
+region,
+agent_arn
+FROM awscc.datasync.agents_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -233,6 +287,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datasync.agents
+SET data__PatchDocument = string('{{ {
+    "AgentName": agent_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AgentArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datasync/agents_list_only/index.md b/website/docs/services/datasync/agents_list_only/index.md
deleted file mode 100644
index f67a51ab2..000000000
--- a/website/docs/services/datasync/agents_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: agents_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - agents_list_only
-  - datasync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>agents</code> in a region or regions, for all properties use <a href="/services/datasync/agents/"><code>agents</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>agents_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataSync::Agent.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datasync.agents_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "agent_arn",
-    "type": "string",
-    "description": "The DataSync Agent ARN."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>agents</code> in a region.
-```sql
-SELECT
-region,
-agent_arn
-FROM awscc.datasync.agents_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>agents_list_only</code> resource, see <a href="/services/datasync/agents/#permissions"><code>agents</code></a>
-
diff --git a/website/docs/services/datasync/index.md b/website/docs/services/datasync/index.md
index 9aa6bc336..bb168b7a4 100644
--- a/website/docs/services/datasync/index.md
+++ b/website/docs/services/datasync/index.md
@@ -20,7 +20,7 @@ The datasync service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>26</b></span><br />
+<span>total resources:&nbsp;<b>13</b></span><br />
 </div>
 </div>
 
@@ -30,32 +30,19 @@ The datasync service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/datasync/agents/">agents</a><br />
-<a href="/services/datasync/agents_list_only/">agents_list_only</a><br />
 <a href="/services/datasync/location_azure_blobs/">location_azure_blobs</a><br />
-<a href="/services/datasync/location_azure_blobs_list_only/">location_azure_blobs_list_only</a><br />
 <a href="/services/datasync/location_efs/">location_efs</a><br />
-<a href="/services/datasync/location_efs_list_only/">location_efs_list_only</a><br />
 <a href="/services/datasync/location_hdfs/">location_hdfs</a><br />
-<a href="/services/datasync/location_hdfs_list_only/">location_hdfs_list_only</a><br />
 <a href="/services/datasync/location_nfs/">location_nfs</a><br />
-<a href="/services/datasync/location_nfs_list_only/">location_nfs_list_only</a><br />
 <a href="/services/datasync/location_object_storages/">location_object_storages</a><br />
-<a href="/services/datasync/location_object_storages_list_only/">location_object_storages_list_only</a><br />
 <a href="/services/datasync/location_s3s/">location_s3s</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/datasync/location_s3s_list_only/">location_s3s_list_only</a><br />
 <a href="/services/datasync/location_smbs/">location_smbs</a><br />
-<a href="/services/datasync/location_smbs_list_only/">location_smbs_list_only</a><br />
 <a href="/services/datasync/locationf_sx_lustres/">locationf_sx_lustres</a><br />
-<a href="/services/datasync/locationf_sx_lustres_list_only/">locationf_sx_lustres_list_only</a><br />
 <a href="/services/datasync/locationf_sx_ontaps/">locationf_sx_ontaps</a><br />
-<a href="/services/datasync/locationf_sx_ontaps_list_only/">locationf_sx_ontaps_list_only</a><br />
 <a href="/services/datasync/locationf_sx_open_zfs/">locationf_sx_open_zfs</a><br />
-<a href="/services/datasync/locationf_sx_open_zfs_list_only/">locationf_sx_open_zfs_list_only</a><br />
 <a href="/services/datasync/locationf_sx_windows/">locationf_sx_windows</a><br />
-<a href="/services/datasync/locationf_sx_windows_list_only/">locationf_sx_windows_list_only</a><br />
-<a href="/services/datasync/tasks/">tasks</a><br />
-<a href="/services/datasync/tasks_list_only/">tasks_list_only</a>
+<a href="/services/datasync/tasks/">tasks</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/datasync/location_azure_blobs/index.md b/website/docs/services/datasync/location_azure_blobs/index.md
index cb20619e8..7b810c3c7 100644
--- a/website/docs/services/datasync/location_azure_blobs/index.md
+++ b/website/docs/services/datasync/location_azure_blobs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>location_azure_blob</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "agent_arns",
@@ -155,6 +164,23 @@ Creates, updates, deletes or gets a <code>location_azure_blob</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "location_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the Azure Blob Location that is created."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationazureblob.html"><code>AWS::DataSync::LocationAzureBlob</code></a>.
 
@@ -164,31 +190,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>location_azure_blobs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AzureBlobAuthenticationType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>location_azure_blobs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>location_azure_blobs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>location_azure_blobs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>location_azure_blobs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -197,6 +229,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>location_azure_blob</code>.
 ```sql
 SELECT
@@ -217,6 +258,19 @@ managed_secret_config
 FROM awscc.datasync.location_azure_blobs
 WHERE region = 'us-east-1' AND data__Identifier = '<LocationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>location_azure_blobs</code> in a region.
+```sql
+SELECT
+region,
+location_arn
+FROM awscc.datasync.location_azure_blobs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -321,6 +375,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datasync.location_azure_blobs
+SET data__PatchDocument = string('{{ {
+    "AgentArns": agent_arns,
+    "AzureBlobAuthenticationType": azure_blob_authentication_type,
+    "AzureBlobSasConfiguration": azure_blob_sas_configuration,
+    "AzureBlobType": azure_blob_type,
+    "AzureAccessTier": azure_access_tier,
+    "Subdirectory": subdirectory,
+    "Tags": tags,
+    "CustomSecretConfig": custom_secret_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LocationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datasync/location_azure_blobs_list_only/index.md b/website/docs/services/datasync/location_azure_blobs_list_only/index.md
deleted file mode 100644
index 3de11983e..000000000
--- a/website/docs/services/datasync/location_azure_blobs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: location_azure_blobs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - location_azure_blobs_list_only
-  - datasync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>location_azure_blobs</code> in a region or regions, for all properties use <a href="/services/datasync/location_azure_blobs/"><code>location_azure_blobs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>location_azure_blobs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::DataSync::LocationAzureBlob.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datasync.location_azure_blobs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "location_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the Azure Blob Location that is created."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>location_azure_blobs</code> in a region.
-```sql
-SELECT
-region,
-location_arn
-FROM awscc.datasync.location_azure_blobs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>location_azure_blobs_list_only</code> resource, see <a href="/services/datasync/location_azure_blobs/#permissions"><code>location_azure_blobs</code></a>
-
diff --git a/website/docs/services/datasync/location_efs/index.md b/website/docs/services/datasync/location_efs/index.md
index 7d23c3786..5f5dfb0b8 100644
--- a/website/docs/services/datasync/location_efs/index.md
+++ b/website/docs/services/datasync/location_efs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>location_ef</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ec2_config",
@@ -109,6 +118,23 @@ Creates, updates, deletes or gets a <code>location_ef</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "location_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the Amazon EFS file system location that is created."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationef.html"><code>AWS::DataSync::LocationEFS</code></a>.
 
@@ -118,31 +144,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>location_efs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Ec2Config, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>location_efs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>location_efs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>location_efs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>location_efs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +183,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>location_ef</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ location_uri
 FROM awscc.datasync.location_efs
 WHERE region = 'us-east-1' AND data__Identifier = '<LocationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>location_efs</code> in a region.
+```sql
+SELECT
+region,
+location_arn
+FROM awscc.datasync.location_efs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -256,6 +310,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datasync.location_efs
+SET data__PatchDocument = string('{{ {
+    "AccessPointArn": access_point_arn,
+    "FileSystemAccessRoleArn": file_system_access_role_arn,
+    "InTransitEncryption": in_transit_encryption,
+    "Subdirectory": subdirectory,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LocationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datasync/location_efs_list_only/index.md b/website/docs/services/datasync/location_efs_list_only/index.md
deleted file mode 100644
index fbd237d24..000000000
--- a/website/docs/services/datasync/location_efs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: location_efs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - location_efs_list_only
-  - datasync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>location_efs</code> in a region or regions, for all properties use <a href="/services/datasync/location_efs/"><code>location_efs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>location_efs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataSync::LocationEFS.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datasync.location_efs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "location_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the Amazon EFS file system location that is created."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>location_efs</code> in a region.
-```sql
-SELECT
-region,
-location_arn
-FROM awscc.datasync.location_efs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>location_efs_list_only</code> resource, see <a href="/services/datasync/location_efs/#permissions"><code>location_efs</code></a>
-
diff --git a/website/docs/services/datasync/location_hdfs/index.md b/website/docs/services/datasync/location_hdfs/index.md
index 75a962759..50074b146 100644
--- a/website/docs/services/datasync/location_hdfs/index.md
+++ b/website/docs/services/datasync/location_hdfs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>location_hdf</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name_nodes",
@@ -151,6 +160,23 @@ Creates, updates, deletes or gets a <code>location_hdf</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "location_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the HDFS location."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdf.html"><code>AWS::DataSync::LocationHDFS</code></a>.
 
@@ -160,31 +186,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>location_hdfs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="NameNodes, AuthenticationType, AgentArns, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>location_hdfs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>location_hdfs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>location_hdfs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>location_hdfs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -193,6 +225,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>location_hdf</code>.
 ```sql
 SELECT
@@ -215,6 +256,19 @@ location_uri
 FROM awscc.datasync.location_hdfs
 WHERE region = 'us-east-1' AND data__Identifier = '<LocationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>location_hdfs</code> in a region.
+```sql
+SELECT
+region,
+location_arn
+FROM awscc.datasync.location_hdfs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -334,6 +388,31 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datasync.location_hdfs
+SET data__PatchDocument = string('{{ {
+    "NameNodes": name_nodes,
+    "BlockSize": block_size,
+    "ReplicationFactor": replication_factor,
+    "KmsKeyProviderUri": kms_key_provider_uri,
+    "QopConfiguration": qop_configuration,
+    "AuthenticationType": authentication_type,
+    "SimpleUser": simple_user,
+    "KerberosPrincipal": kerberos_principal,
+    "KerberosKeytab": kerberos_keytab,
+    "KerberosKrb5Conf": kerberos_krb5_conf,
+    "Tags": tags,
+    "AgentArns": agent_arns,
+    "Subdirectory": subdirectory
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LocationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datasync/location_hdfs_list_only/index.md b/website/docs/services/datasync/location_hdfs_list_only/index.md
deleted file mode 100644
index b4acf46d7..000000000
--- a/website/docs/services/datasync/location_hdfs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: location_hdfs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - location_hdfs_list_only
-  - datasync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>location_hdfs</code> in a region or regions, for all properties use <a href="/services/datasync/location_hdfs/"><code>location_hdfs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>location_hdfs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataSync::LocationHDFS.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datasync.location_hdfs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "location_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the HDFS location."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>location_hdfs</code> in a region.
-```sql
-SELECT
-region,
-location_arn
-FROM awscc.datasync.location_hdfs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>location_hdfs_list_only</code> resource, see <a href="/services/datasync/location_hdfs/#permissions"><code>location_hdfs</code></a>
-
diff --git a/website/docs/services/datasync/location_nfs/index.md b/website/docs/services/datasync/location_nfs/index.md
index 412d5cda5..5347b49a8 100644
--- a/website/docs/services/datasync/location_nfs/index.md
+++ b/website/docs/services/datasync/location_nfs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>location_nf</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "mount_options",
@@ -101,6 +110,23 @@ Creates, updates, deletes or gets a <code>location_nf</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "location_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the NFS location."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationnf.html"><code>AWS::DataSync::LocationNFS</code></a>.
 
@@ -110,31 +136,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>location_nfs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="OnPremConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>location_nfs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>location_nfs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>location_nfs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>location_nfs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -143,6 +175,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>location_nf</code>.
 ```sql
 SELECT
@@ -157,6 +198,19 @@ location_uri
 FROM awscc.datasync.location_nfs
 WHERE region = 'us-east-1' AND data__Identifier = '<LocationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>location_nfs</code> in a region.
+```sql
+SELECT
+region,
+location_arn
+FROM awscc.datasync.location_nfs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -238,6 +292,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datasync.location_nfs
+SET data__PatchDocument = string('{{ {
+    "MountOptions": mount_options,
+    "OnPremConfig": on_prem_config,
+    "ServerHostname": server_hostname,
+    "Subdirectory": subdirectory,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LocationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datasync/location_nfs_list_only/index.md b/website/docs/services/datasync/location_nfs_list_only/index.md
deleted file mode 100644
index 50d41b106..000000000
--- a/website/docs/services/datasync/location_nfs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: location_nfs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - location_nfs_list_only
-  - datasync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>location_nfs</code> in a region or regions, for all properties use <a href="/services/datasync/location_nfs/"><code>location_nfs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>location_nfs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataSync::LocationNFS</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datasync.location_nfs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "location_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the NFS location."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>location_nfs</code> in a region.
-```sql
-SELECT
-region,
-location_arn
-FROM awscc.datasync.location_nfs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>location_nfs_list_only</code> resource, see <a href="/services/datasync/location_nfs/#permissions"><code>location_nfs</code></a>
-
diff --git a/website/docs/services/datasync/location_object_storages/index.md b/website/docs/services/datasync/location_object_storages/index.md
index f8e102b5b..119d4b15b 100644
--- a/website/docs/services/datasync/location_object_storages/index.md
+++ b/website/docs/services/datasync/location_object_storages/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>location_object_storage</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "access_key",
@@ -158,6 +167,23 @@ Creates, updates, deletes or gets a <code>location_object_storage</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "location_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the location that is created."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationobjectstorage.html"><code>AWS::DataSync::LocationObjectStorage</code></a>.
 
@@ -167,31 +193,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>location_object_storages</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>location_object_storages</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>location_object_storages</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>location_object_storages_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>location_object_storages</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -200,6 +232,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>location_object_storage</code>.
 ```sql
 SELECT
@@ -222,6 +263,19 @@ managed_secret_config
 FROM awscc.datasync.location_object_storages
 WHERE region = 'us-east-1' AND data__Identifier = '<LocationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>location_object_storages</code> in a region.
+```sql
+SELECT
+region,
+location_arn
+FROM awscc.datasync.location_object_storages_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -355,6 +409,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datasync.location_object_storages
+SET data__PatchDocument = string('{{ {
+    "AccessKey": access_key,
+    "AgentArns": agent_arns,
+    "SecretKey": secret_key,
+    "ServerCertificate": server_certificate,
+    "ServerHostname": server_hostname,
+    "ServerPort": server_port,
+    "ServerProtocol": server_protocol,
+    "Subdirectory": subdirectory,
+    "Tags": tags,
+    "CustomSecretConfig": custom_secret_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LocationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datasync/location_object_storages_list_only/index.md b/website/docs/services/datasync/location_object_storages_list_only/index.md
deleted file mode 100644
index b55fd0977..000000000
--- a/website/docs/services/datasync/location_object_storages_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: location_object_storages_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - location_object_storages_list_only
-  - datasync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>location_object_storages</code> in a region or regions, for all properties use <a href="/services/datasync/location_object_storages/"><code>location_object_storages</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>location_object_storages_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::DataSync::LocationObjectStorage.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datasync.location_object_storages_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "location_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the location that is created."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>location_object_storages</code> in a region.
-```sql
-SELECT
-region,
-location_arn
-FROM awscc.datasync.location_object_storages_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>location_object_storages_list_only</code> resource, see <a href="/services/datasync/location_object_storages/#permissions"><code>location_object_storages</code></a>
-
diff --git a/website/docs/services/datasync/location_s3s/index.md b/website/docs/services/datasync/location_s3s/index.md
index c28ef878e..25e5afc30 100644
--- a/website/docs/services/datasync/location_s3s/index.md
+++ b/website/docs/services/datasync/location_s3s/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>location_s3</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "s3_config",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets a <code>location_s3</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "location_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the Amazon S3 bucket location."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locations3.html"><code>AWS::DataSync::LocationS3</code></a>.
 
@@ -103,31 +129,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>location_s3s</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="S3Config, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>location_s3s</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>location_s3s</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>location_s3s_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>location_s3s</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>location_s3</code>.
 ```sql
 SELECT
@@ -150,6 +191,19 @@ location_uri
 FROM awscc.datasync.location_s3s
 WHERE region = 'us-east-1' AND data__Identifier = '<LocationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>location_s3s</code> in a region.
+```sql
+SELECT
+region,
+location_arn
+FROM awscc.datasync.location_s3s_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -229,6 +283,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datasync.location_s3s
+SET data__PatchDocument = string('{{ {
+    "S3Config": s3_config,
+    "Subdirectory": subdirectory,
+    "S3StorageClass": s3_storage_class,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LocationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datasync/location_s3s_list_only/index.md b/website/docs/services/datasync/location_s3s_list_only/index.md
deleted file mode 100644
index 3ab9ad6bf..000000000
--- a/website/docs/services/datasync/location_s3s_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: location_s3s_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - location_s3s_list_only
-  - datasync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>location_s3s</code> in a region or regions, for all properties use <a href="/services/datasync/location_s3s/"><code>location_s3s</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>location_s3s_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataSync::LocationS3</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datasync.location_s3s_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "location_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the Amazon S3 bucket location."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>location_s3s</code> in a region.
-```sql
-SELECT
-region,
-location_arn
-FROM awscc.datasync.location_s3s_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>location_s3s_list_only</code> resource, see <a href="/services/datasync/location_s3s/#permissions"><code>location_s3s</code></a>
-
diff --git a/website/docs/services/datasync/location_smbs/index.md b/website/docs/services/datasync/location_smbs/index.md
index 961d15e1b..4d9e9ae4d 100644
--- a/website/docs/services/datasync/location_smbs/index.md
+++ b/website/docs/services/datasync/location_smbs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>location_smb</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "agent_arns",
@@ -134,6 +143,23 @@ Creates, updates, deletes or gets a <code>location_smb</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "location_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the SMB location that is created."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationsmb.html"><code>AWS::DataSync::LocationSMB</code></a>.
 
@@ -143,31 +169,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>location_smbs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AgentArns, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>location_smbs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>location_smbs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>location_smbs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>location_smbs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -176,6 +208,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>location_smb</code>.
 ```sql
 SELECT
@@ -198,6 +239,19 @@ kerberos_krb5_conf
 FROM awscc.datasync.location_smbs
 WHERE region = 'us-east-1' AND data__Identifier = '<LocationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>location_smbs</code> in a region.
+```sql
+SELECT
+region,
+location_arn
+FROM awscc.datasync.location_smbs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -311,6 +365,31 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datasync.location_smbs
+SET data__PatchDocument = string('{{ {
+    "AgentArns": agent_arns,
+    "Domain": domain,
+    "MountOptions": mount_options,
+    "Password": password,
+    "ServerHostname": server_hostname,
+    "Subdirectory": subdirectory,
+    "User": user,
+    "Tags": tags,
+    "AuthenticationType": authentication_type,
+    "DnsIpAddresses": dns_ip_addresses,
+    "KerberosPrincipal": kerberos_principal,
+    "KerberosKeytab": kerberos_keytab,
+    "KerberosKrb5Conf": kerberos_krb5_conf
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LocationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datasync/location_smbs_list_only/index.md b/website/docs/services/datasync/location_smbs_list_only/index.md
deleted file mode 100644
index 7ea067c5f..000000000
--- a/website/docs/services/datasync/location_smbs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: location_smbs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - location_smbs_list_only
-  - datasync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>location_smbs</code> in a region or regions, for all properties use <a href="/services/datasync/location_smbs/"><code>location_smbs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>location_smbs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataSync::LocationSMB.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datasync.location_smbs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "location_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the SMB location that is created."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>location_smbs</code> in a region.
-```sql
-SELECT
-region,
-location_arn
-FROM awscc.datasync.location_smbs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>location_smbs_list_only</code> resource, see <a href="/services/datasync/location_smbs/#permissions"><code>location_smbs</code></a>
-
diff --git a/website/docs/services/datasync/locationf_sx_lustres/index.md b/website/docs/services/datasync/locationf_sx_lustres/index.md
index c7bde346e..c1ecea61f 100644
--- a/website/docs/services/datasync/locationf_sx_lustres/index.md
+++ b/website/docs/services/datasync/locationf_sx_lustres/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>locationf_sx_lustre</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "fsx_filesystem_arn",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>locationf_sx_lustre</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "location_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the Amazon FSx for Lustre file system location that is created."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxlustre.html"><code>AWS::DataSync::LocationFSxLustre</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>locationf_sx_lustres</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SecurityGroupArns, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>locationf_sx_lustres</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>locationf_sx_lustres</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>locationf_sx_lustres_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>locationf_sx_lustres</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>locationf_sx_lustre</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ location_uri
 FROM awscc.datasync.locationf_sx_lustres
 WHERE region = 'us-east-1' AND data__Identifier = '<LocationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>locationf_sx_lustres</code> in a region.
+```sql
+SELECT
+region,
+location_arn
+FROM awscc.datasync.locationf_sx_lustres_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -212,6 +266,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datasync.locationf_sx_lustres
+SET data__PatchDocument = string('{{ {
+    "Subdirectory": subdirectory,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LocationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datasync/locationf_sx_lustres_list_only/index.md b/website/docs/services/datasync/locationf_sx_lustres_list_only/index.md
deleted file mode 100644
index 0170e745d..000000000
--- a/website/docs/services/datasync/locationf_sx_lustres_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: locationf_sx_lustres_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - locationf_sx_lustres_list_only
-  - datasync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>locationf_sx_lustres</code> in a region or regions, for all properties use <a href="/services/datasync/locationf_sx_lustres/"><code>locationf_sx_lustres</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>locationf_sx_lustres_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataSync::LocationFSxLustre.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datasync.locationf_sx_lustres_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "location_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the Amazon FSx for Lustre file system location that is created."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>locationf_sx_lustres</code> in a region.
-```sql
-SELECT
-region,
-location_arn
-FROM awscc.datasync.locationf_sx_lustres_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>locationf_sx_lustres_list_only</code> resource, see <a href="/services/datasync/locationf_sx_lustres/#permissions"><code>locationf_sx_lustres</code></a>
-
diff --git a/website/docs/services/datasync/locationf_sx_ontaps/index.md b/website/docs/services/datasync/locationf_sx_ontaps/index.md
index d33712a77..c7037db35 100644
--- a/website/docs/services/datasync/locationf_sx_ontaps/index.md
+++ b/website/docs/services/datasync/locationf_sx_ontaps/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>locationf_sx_ontap</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "storage_virtual_machine_arn",
@@ -113,6 +122,23 @@ Creates, updates, deletes or gets a <code>locationf_sx_ontap</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "location_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the Amazon FSx ONTAP file system location that is created."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxontap.html"><code>AWS::DataSync::LocationFSxONTAP</code></a>.
 
@@ -122,31 +148,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>locationf_sx_ontaps</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SecurityGroupArns, StorageVirtualMachineArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>locationf_sx_ontaps</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>locationf_sx_ontaps</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>locationf_sx_ontaps_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>locationf_sx_ontaps</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -155,6 +187,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>locationf_sx_ontap</code>.
 ```sql
 SELECT
@@ -170,6 +211,19 @@ location_uri
 FROM awscc.datasync.locationf_sx_ontaps
 WHERE region = 'us-east-1' AND data__Identifier = '<LocationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>locationf_sx_ontaps</code> in a region.
+```sql
+SELECT
+region,
+location_arn
+FROM awscc.datasync.locationf_sx_ontaps_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -254,6 +308,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datasync.locationf_sx_ontaps
+SET data__PatchDocument = string('{{ {
+    "Protocol": protocol,
+    "Subdirectory": subdirectory,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LocationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datasync/locationf_sx_ontaps_list_only/index.md b/website/docs/services/datasync/locationf_sx_ontaps_list_only/index.md
deleted file mode 100644
index 32354fdf2..000000000
--- a/website/docs/services/datasync/locationf_sx_ontaps_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: locationf_sx_ontaps_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - locationf_sx_ontaps_list_only
-  - datasync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>locationf_sx_ontaps</code> in a region or regions, for all properties use <a href="/services/datasync/locationf_sx_ontaps/"><code>locationf_sx_ontaps</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>locationf_sx_ontaps_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataSync::LocationFSxONTAP.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datasync.locationf_sx_ontaps_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "location_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the Amazon FSx ONTAP file system location that is created."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>locationf_sx_ontaps</code> in a region.
-```sql
-SELECT
-region,
-location_arn
-FROM awscc.datasync.locationf_sx_ontaps_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>locationf_sx_ontaps_list_only</code> resource, see <a href="/services/datasync/locationf_sx_ontaps/#permissions"><code>locationf_sx_ontaps</code></a>
-
diff --git a/website/docs/services/datasync/locationf_sx_open_zfs/index.md b/website/docs/services/datasync/locationf_sx_open_zfs/index.md
index 3f09fc675..5b3dd3c1c 100644
--- a/website/docs/services/datasync/locationf_sx_open_zfs/index.md
+++ b/website/docs/services/datasync/locationf_sx_open_zfs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>locationf_sx_open_zf</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "fsx_filesystem_arn",
@@ -108,6 +117,23 @@ Creates, updates, deletes or gets a <code>locationf_sx_open_zf</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "location_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the Amazon FSx OpenZFS file system location that is created."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxopenzf.html"><code>AWS::DataSync::LocationFSxOpenZFS</code></a>.
 
@@ -117,31 +143,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>locationf_sx_open_zfs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SecurityGroupArns, Protocol, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>locationf_sx_open_zfs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>locationf_sx_open_zfs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>locationf_sx_open_zfs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>locationf_sx_open_zfs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -150,6 +182,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>locationf_sx_open_zf</code>.
 ```sql
 SELECT
@@ -164,6 +205,19 @@ location_uri
 FROM awscc.datasync.locationf_sx_open_zfs
 WHERE region = 'us-east-1' AND data__Identifier = '<LocationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>locationf_sx_open_zfs</code> in a region.
+```sql
+SELECT
+region,
+location_arn
+FROM awscc.datasync.locationf_sx_open_zfs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -248,6 +302,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datasync.locationf_sx_open_zfs
+SET data__PatchDocument = string('{{ {
+    "Protocol": protocol,
+    "Subdirectory": subdirectory,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LocationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datasync/locationf_sx_open_zfs_list_only/index.md b/website/docs/services/datasync/locationf_sx_open_zfs_list_only/index.md
deleted file mode 100644
index a4b4df7d6..000000000
--- a/website/docs/services/datasync/locationf_sx_open_zfs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: locationf_sx_open_zfs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - locationf_sx_open_zfs_list_only
-  - datasync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>locationf_sx_open_zfs</code> in a region or regions, for all properties use <a href="/services/datasync/locationf_sx_open_zfs/"><code>locationf_sx_open_zfs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>locationf_sx_open_zfs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataSync::LocationFSxOpenZFS.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datasync.locationf_sx_open_zfs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "location_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the Amazon FSx OpenZFS file system location that is created."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>locationf_sx_open_zfs</code> in a region.
-```sql
-SELECT
-region,
-location_arn
-FROM awscc.datasync.locationf_sx_open_zfs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>locationf_sx_open_zfs_list_only</code> resource, see <a href="/services/datasync/locationf_sx_open_zfs/#permissions"><code>locationf_sx_open_zfs</code></a>
-
diff --git a/website/docs/services/datasync/locationf_sx_windows/index.md b/website/docs/services/datasync/locationf_sx_windows/index.md
index aa6fc99dc..39a1468ab 100644
--- a/website/docs/services/datasync/locationf_sx_windows/index.md
+++ b/website/docs/services/datasync/locationf_sx_windows/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>locationf_sx_window</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>locationf_sx_window</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "location_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the Amazon FSx for Windows file system location that is created."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxwindow.html"><code>AWS::DataSync::LocationFSxWindows</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>locationf_sx_windows</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="User, SecurityGroupArns, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>locationf_sx_windows</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>locationf_sx_windows</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>locationf_sx_windows_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>locationf_sx_windows</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>locationf_sx_window</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ location_uri
 FROM awscc.datasync.locationf_sx_windows
 WHERE region = 'us-east-1' AND data__Identifier = '<LocationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>locationf_sx_windows</code> in a region.
+```sql
+SELECT
+region,
+location_arn
+FROM awscc.datasync.locationf_sx_windows_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -244,6 +298,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datasync.locationf_sx_windows
+SET data__PatchDocument = string('{{ {
+    "Domain": domain,
+    "Password": password,
+    "Subdirectory": subdirectory,
+    "User": user,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LocationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datasync/locationf_sx_windows_list_only/index.md b/website/docs/services/datasync/locationf_sx_windows_list_only/index.md
deleted file mode 100644
index c22e922d2..000000000
--- a/website/docs/services/datasync/locationf_sx_windows_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: locationf_sx_windows_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - locationf_sx_windows_list_only
-  - datasync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>locationf_sx_windows</code> in a region or regions, for all properties use <a href="/services/datasync/locationf_sx_windows/"><code>locationf_sx_windows</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>locationf_sx_windows_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataSync::LocationFSxWindows.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datasync.locationf_sx_windows_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "location_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the Amazon FSx for Windows file system location that is created."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>locationf_sx_windows</code> in a region.
-```sql
-SELECT
-region,
-location_arn
-FROM awscc.datasync.locationf_sx_windows_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>locationf_sx_windows_list_only</code> resource, see <a href="/services/datasync/locationf_sx_windows/#permissions"><code>locationf_sx_windows</code></a>
-
diff --git a/website/docs/services/datasync/tasks/index.md b/website/docs/services/datasync/tasks/index.md
index 9630839c6..45ea43583 100644
--- a/website/docs/services/datasync/tasks/index.md
+++ b/website/docs/services/datasync/tasks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>task</code> resource or lists <code>ta
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "excludes",
@@ -380,6 +389,23 @@ Creates, updates, deletes or gets a <code>task</code> resource or lists <code>ta
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "task_arn",
+    "type": "string",
+    "description": "The ARN of the task."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html"><code>AWS::DataSync::Task</code></a>.
 
@@ -389,31 +415,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>tasks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DestinationLocationArn, SourceLocationArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>tasks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>tasks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>tasks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>tasks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -422,6 +454,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>task</code>.
 ```sql
 SELECT
@@ -445,6 +486,19 @@ destination_network_interface_arns
 FROM awscc.datasync.tasks
 WHERE region = 'us-east-1' AND data__Identifier = '<TaskArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>tasks</code> in a region.
+```sql
+SELECT
+region,
+task_arn
+FROM awscc.datasync.tasks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -598,6 +652,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datasync.tasks
+SET data__PatchDocument = string('{{ {
+    "Excludes": excludes,
+    "Includes": includes,
+    "Tags": tags,
+    "CloudWatchLogGroupArn": cloud_watch_log_group_arn,
+    "Name": name,
+    "Options": options,
+    "TaskReportConfig": task_report_config,
+    "ManifestConfig": manifest_config,
+    "Schedule": schedule
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TaskArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datasync/tasks_list_only/index.md b/website/docs/services/datasync/tasks_list_only/index.md
deleted file mode 100644
index 1360dc456..000000000
--- a/website/docs/services/datasync/tasks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: tasks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - tasks_list_only
-  - datasync
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>tasks</code> in a region or regions, for all properties use <a href="/services/datasync/tasks/"><code>tasks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>tasks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DataSync::Task.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datasync.tasks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "task_arn",
-    "type": "string",
-    "description": "The ARN of the task."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>tasks</code> in a region.
-```sql
-SELECT
-region,
-task_arn
-FROM awscc.datasync.tasks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>tasks_list_only</code> resource, see <a href="/services/datasync/tasks/#permissions"><code>tasks</code></a>
-
diff --git a/website/docs/services/datazone/connections/index.md b/website/docs/services/datazone/connections/index.md
index ecb66dd81..fca0c506e 100644
--- a/website/docs/services/datazone/connections/index.md
+++ b/website/docs/services/datazone/connections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>connection</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "aws_location",
@@ -127,6 +136,28 @@ Creates, updates, deletes or gets a <code>connection</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "connection_id",
+    "type": "string",
+    "description": "The ID of the connection."
+  },
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": "The ID of the domain in which the connection is created."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-connection.html"><code>AWS::DataZone::Connection</code></a>.
 
@@ -136,31 +167,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainIdentifier, EnvironmentIdentifier, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>connections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -169,6 +206,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>connection</code>.
 ```sql
 SELECT
@@ -189,6 +235,20 @@ type
 FROM awscc.datazone.connections
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainId>|<ConnectionId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>connections</code> in a region.
+```sql
+SELECT
+region,
+domain_id,
+connection_id
+FROM awscc.datazone.connections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -277,6 +337,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datazone.connections
+SET data__PatchDocument = string('{{ {
+    "AwsLocation": aws_location,
+    "Description": description,
+    "Props": props
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainId>|<ConnectionId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/connections_list_only/index.md b/website/docs/services/datazone/connections_list_only/index.md
deleted file mode 100644
index 921c1a366..000000000
--- a/website/docs/services/datazone/connections_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: connections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - connections_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>connections</code> in a region or regions, for all properties use <a href="/services/datazone/connections/"><code>connections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>connections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Connections enables users to connect their DataZone resources (domains, projects, and environments) to external resources/services (data, compute, etc)</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.connections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "connection_id",
-    "type": "string",
-    "description": "The ID of the connection."
-  },
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": "The ID of the domain in which the connection is created."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>connections</code> in a region.
-```sql
-SELECT
-region,
-domain_id,
-connection_id
-FROM awscc.datazone.connections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>connections_list_only</code> resource, see <a href="/services/datazone/connections/#permissions"><code>connections</code></a>
-
diff --git a/website/docs/services/datazone/data_sources/index.md b/website/docs/services/datazone/data_sources/index.md
index 597eb638d..dc2734957 100644
--- a/website/docs/services/datazone/data_sources/index.md
+++ b/website/docs/services/datazone/data_sources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "asset_forms_input",
@@ -201,6 +210,28 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": "The ID of the Amazon DataZone domain where the data source is created."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The unique identifier of the data source."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-datasource.html"><code>AWS::DataZone::DataSource</code></a>.
 
@@ -210,31 +241,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, DomainIdentifier, ProjectIdentifier, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_sources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -243,6 +280,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_source</code>.
 ```sql
 SELECT
@@ -274,6 +320,20 @@ updated_at
 FROM awscc.datazone.data_sources
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainId>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_sources</code> in a region.
+```sql
+SELECT
+region,
+domain_id,
+id
+FROM awscc.datazone.data_sources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -395,6 +455,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datazone.data_sources
+SET data__PatchDocument = string('{{ {
+    "AssetFormsInput": asset_forms_input,
+    "Description": description,
+    "EnableSetting": enable_setting,
+    "Configuration": configuration,
+    "Name": name,
+    "PublishOnImport": publish_on_import,
+    "Recommendation": recommendation,
+    "Schedule": schedule
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainId>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/data_sources_list_only/index.md b/website/docs/services/datazone/data_sources_list_only/index.md
deleted file mode 100644
index cd615b47a..000000000
--- a/website/docs/services/datazone/data_sources_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: data_sources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_sources_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_sources</code> in a region or regions, for all properties use <a href="/services/datazone/data_sources/"><code>data_sources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_sources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A data source is used to import technical metadata of assets (data) from the source databases or data warehouses into Amazon DataZone.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.data_sources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": "The ID of the Amazon DataZone domain where the data source is created."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The unique identifier of the data source."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_sources</code> in a region.
-```sql
-SELECT
-region,
-domain_id,
-id
-FROM awscc.datazone.data_sources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_sources_list_only</code> resource, see <a href="/services/datazone/data_sources/#permissions"><code>data_sources</code></a>
-
diff --git a/website/docs/services/datazone/domain_units/index.md b/website/docs/services/datazone/domain_units/index.md
index 36eb615c8..38b364253 100644
--- a/website/docs/services/datazone/domain_units/index.md
+++ b/website/docs/services/datazone/domain_units/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>domain_unit</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain_identifier",
@@ -90,6 +99,28 @@ Creates, updates, deletes or gets a <code>domain_unit</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": "The ID of the domain where the domain unit was created."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the domain unit."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-domainunit.html"><code>AWS::DataZone::DomainUnit</code></a>.
 
@@ -99,31 +130,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>domain_units</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainIdentifier, Name, ParentDomainUnitIdentifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>domain_units</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>domain_units</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>domain_units_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>domain_units</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -132,6 +169,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>domain_unit</code>.
 ```sql
 SELECT
@@ -149,6 +195,20 @@ last_updated_at
 FROM awscc.datazone.domain_units
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainId>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>domain_units</code> in a region.
+```sql
+SELECT
+region,
+domain_id,
+id
+FROM awscc.datazone.domain_units_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -225,6 +285,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datazone.domain_units
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Name": name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainId>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/domain_units_list_only/index.md b/website/docs/services/datazone/domain_units_list_only/index.md
deleted file mode 100644
index 11f7c2a9e..000000000
--- a/website/docs/services/datazone/domain_units_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: domain_units_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - domain_units_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>domain_units</code> in a region or regions, for all properties use <a href="/services/datazone/domain_units/"><code>domain_units</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>domain_units_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A domain unit enables you to easily organize your assets and other domain entities under specific business units and teams.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.domain_units_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": "The ID of the domain where the domain unit was created."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the domain unit."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>domain_units</code> in a region.
-```sql
-SELECT
-region,
-domain_id,
-id
-FROM awscc.datazone.domain_units_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>domain_units_list_only</code> resource, see <a href="/services/datazone/domain_units/#permissions"><code>domain_units</code></a>
-
diff --git a/website/docs/services/datazone/domains/index.md b/website/docs/services/datazone/domains/index.md
index 097a9a9f1..9734437c6 100644
--- a/website/docs/services/datazone/domains/index.md
+++ b/website/docs/services/datazone/domains/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>domain</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "root_domain_unit_id",
@@ -149,6 +158,23 @@ Creates, updates, deletes or gets a <code>domain</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The id of the Amazon DataZone domain."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-domain.html"><code>AWS::DataZone::Domain</code></a>.
 
@@ -158,31 +184,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainExecutionRole, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>domains_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -191,6 +223,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>domain</code>.
 ```sql
 SELECT
@@ -214,6 +255,19 @@ tags
 FROM awscc.datazone.domains
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>domains</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.datazone.domains_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -309,6 +363,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datazone.domains
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "DomainExecutionRole": domain_execution_role,
+    "ServiceRole": service_role,
+    "Name": name,
+    "SingleSignOn": single_sign_on,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/domains_list_only/index.md b/website/docs/services/datazone/domains_list_only/index.md
deleted file mode 100644
index d849f2260..000000000
--- a/website/docs/services/datazone/domains_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: domains_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - domains_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>domains</code> in a region or regions, for all properties use <a href="/services/datazone/domains/"><code>domains</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>domains_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A domain is an organizing entity for connecting together assets, users, and their projects</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.domains_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The id of the Amazon DataZone domain."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>domains</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.datazone.domains_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>domains_list_only</code> resource, see <a href="/services/datazone/domains/#permissions"><code>domains</code></a>
-
diff --git a/website/docs/services/datazone/environment_actions/index.md b/website/docs/services/datazone/environment_actions/index.md
index 26c4ba41d..947815246 100644
--- a/website/docs/services/datazone/environment_actions/index.md
+++ b/website/docs/services/datazone/environment_actions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>environment_action</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -92,6 +101,33 @@ Creates, updates, deletes or gets an <code>environment_action</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": "The identifier of the Amazon DataZone domain in which the environment is created."
+  },
+  {
+    "name": "environment_id",
+    "type": "string",
+    "description": "The identifier of the Amazon DataZone environment in which the action is taking place"
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the Amazon DataZone environment action."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environmentaction.html"><code>AWS::DataZone::EnvironmentActions</code></a>.
 
@@ -101,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>environment_actions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>environment_actions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>environment_actions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>environment_actions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>environment_actions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>environment_action</code>.
 ```sql
 SELECT
@@ -150,6 +201,21 @@ parameters
 FROM awscc.datazone.environment_actions
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainId>|<EnvironmentId>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>environment_actions</code> in a region.
+```sql
+SELECT
+region,
+domain_id,
+environment_id,
+id
+FROM awscc.datazone.environment_actions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -231,6 +297,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datazone.environment_actions
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Identifier": identifier,
+    "Name": name,
+    "Parameters": parameters
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainId>|<EnvironmentId>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/environment_actions_list_only/index.md b/website/docs/services/datazone/environment_actions_list_only/index.md
deleted file mode 100644
index 43e2badf4..000000000
--- a/website/docs/services/datazone/environment_actions_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: environment_actions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - environment_actions_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>environment_actions</code> in a region or regions, for all properties use <a href="/services/datazone/environment_actions/"><code>environment_actions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>environment_actions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::DataZone::EnvironmentActions Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.environment_actions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": "The identifier of the Amazon DataZone domain in which the environment is created."
-  },
-  {
-    "name": "environment_id",
-    "type": "string",
-    "description": "The identifier of the Amazon DataZone environment in which the action is taking place"
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the Amazon DataZone environment action."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>environment_actions</code> in a region.
-```sql
-SELECT
-region,
-domain_id,
-environment_id,
-id
-FROM awscc.datazone.environment_actions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>environment_actions_list_only</code> resource, see <a href="/services/datazone/environment_actions/#permissions"><code>environment_actions</code></a>
-
diff --git a/website/docs/services/datazone/environment_blueprint_configurations/index.md b/website/docs/services/datazone/environment_blueprint_configurations/index.md
index f48276207..d06acf043 100644
--- a/website/docs/services/datazone/environment_blueprint_configurations/index.md
+++ b/website/docs/services/datazone/environment_blueprint_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>environment_blueprint_configuration</
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "created_at",
@@ -112,6 +121,28 @@ Creates, updates, deletes or gets an <code>environment_blueprint_configuration</
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "environment_blueprint_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environmentblueprintconfiguration.html"><code>AWS::DataZone::EnvironmentBlueprintConfiguration</code></a>.
 
@@ -121,31 +152,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>environment_blueprint_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainIdentifier, EnvironmentBlueprintIdentifier, EnabledRegions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>environment_blueprint_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>environment_blueprint_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>environment_blueprint_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>environment_blueprint_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -154,6 +191,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>environment_blueprint_configuration</code>.
 ```sql
 SELECT
@@ -173,6 +219,20 @@ manage_access_role_arn
 FROM awscc.datazone.environment_blueprint_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainId>|<EnvironmentBlueprintId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>environment_blueprint_configurations</code> in a region.
+```sql
+SELECT
+region,
+domain_id,
+environment_blueprint_id
+FROM awscc.datazone.environment_blueprint_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -269,6 +329,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datazone.environment_blueprint_configurations
+SET data__PatchDocument = string('{{ {
+    "EnabledRegions": enabled_regions,
+    "RegionalParameters": regional_parameters,
+    "ProvisioningRoleArn": provisioning_role_arn,
+    "ProvisioningConfigurations": provisioning_configurations,
+    "EnvironmentRolePermissionBoundary": environment_role_permission_boundary,
+    "ManageAccessRoleArn": manage_access_role_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainId>|<EnvironmentBlueprintId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/environment_blueprint_configurations_list_only/index.md b/website/docs/services/datazone/environment_blueprint_configurations_list_only/index.md
deleted file mode 100644
index cd9f23ed3..000000000
--- a/website/docs/services/datazone/environment_blueprint_configurations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: environment_blueprint_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - environment_blueprint_configurations_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>environment_blueprint_configurations</code> in a region or regions, for all properties use <a href="/services/datazone/environment_blueprint_configurations/"><code>environment_blueprint_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>environment_blueprint_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::DataZone::EnvironmentBlueprintConfiguration Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.environment_blueprint_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "environment_blueprint_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>environment_blueprint_configurations</code> in a region.
-```sql
-SELECT
-region,
-domain_id,
-environment_blueprint_id
-FROM awscc.datazone.environment_blueprint_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>environment_blueprint_configurations_list_only</code> resource, see <a href="/services/datazone/environment_blueprint_configurations/#permissions"><code>environment_blueprint_configurations</code></a>
-
diff --git a/website/docs/services/datazone/environment_profiles/index.md b/website/docs/services/datazone/environment_profiles/index.md
index 9f5253729..05db30691 100644
--- a/website/docs/services/datazone/environment_profiles/index.md
+++ b/website/docs/services/datazone/environment_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>environment_profile</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "aws_account_id",
@@ -127,6 +136,28 @@ Creates, updates, deletes or gets an <code>environment_profile</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": "The ID of the Amazon DataZone domain in which this environment profile is created."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of this Amazon DataZone environment profile."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environmentprofile.html"><code>AWS::DataZone::EnvironmentProfile</code></a>.
 
@@ -136,31 +167,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>environment_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EnvironmentBlueprintIdentifier, ProjectIdentifier, DomainIdentifier, AwsAccountId, AwsAccountRegion, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>environment_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>environment_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>environment_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>environment_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -169,6 +206,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>environment_profile</code>.
 ```sql
 SELECT
@@ -191,6 +237,20 @@ user_parameters
 FROM awscc.datazone.environment_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainId>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>environment_profiles</code> in a region.
+```sql
+SELECT
+region,
+domain_id,
+id
+FROM awscc.datazone.environment_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -291,6 +351,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datazone.environment_profiles
+SET data__PatchDocument = string('{{ {
+    "AwsAccountId": aws_account_id,
+    "AwsAccountRegion": aws_account_region,
+    "Description": description,
+    "Name": name,
+    "UserParameters": user_parameters
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainId>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/environment_profiles_list_only/index.md b/website/docs/services/datazone/environment_profiles_list_only/index.md
deleted file mode 100644
index 11ecc846a..000000000
--- a/website/docs/services/datazone/environment_profiles_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: environment_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - environment_profiles_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>environment_profiles</code> in a region or regions, for all properties use <a href="/services/datazone/environment_profiles/"><code>environment_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>environment_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS Datazone Environment Profile is pre-configured set of resources and blueprints that provide reusable templates for creating environments.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.environment_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": "The ID of the Amazon DataZone domain in which this environment profile is created."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of this Amazon DataZone environment profile."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>environment_profiles</code> in a region.
-```sql
-SELECT
-region,
-domain_id,
-id
-FROM awscc.datazone.environment_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>environment_profiles_list_only</code> resource, see <a href="/services/datazone/environment_profiles/#permissions"><code>environment_profiles</code></a>
-
diff --git a/website/docs/services/datazone/environments/index.md b/website/docs/services/datazone/environments/index.md
index 7452f5b67..f71c00b87 100644
--- a/website/docs/services/datazone/environments/index.md
+++ b/website/docs/services/datazone/environments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "aws_account_id",
@@ -162,6 +171,28 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": "The identifier of the Amazon DataZone domain in which the environment is created."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the Amazon DataZone environment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environment.html"><code>AWS::DataZone::Environment</code></a>.
 
@@ -171,31 +202,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, ProjectIdentifier, DomainIdentifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>environments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -204,6 +241,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>environment</code>.
 ```sql
 SELECT
@@ -233,6 +279,20 @@ user_parameters
 FROM awscc.datazone.environments
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainId>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>environments</code> in a region.
+```sql
+SELECT
+region,
+domain_id,
+id
+FROM awscc.datazone.environments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -336,6 +396,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datazone.environments
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "GlossaryTerms": glossary_terms,
+    "EnvironmentRoleArn": environment_role_arn,
+    "Name": name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainId>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/environments_list_only/index.md b/website/docs/services/datazone/environments_list_only/index.md
deleted file mode 100644
index ea54bb390..000000000
--- a/website/docs/services/datazone/environments_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: environments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - environments_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>environments</code> in a region or regions, for all properties use <a href="/services/datazone/environments/"><code>environments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>environments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::DataZone::Environment Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.environments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": "The identifier of the Amazon DataZone domain in which the environment is created."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the Amazon DataZone environment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>environments</code> in a region.
-```sql
-SELECT
-region,
-domain_id,
-id
-FROM awscc.datazone.environments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>environments_list_only</code> resource, see <a href="/services/datazone/environments/#permissions"><code>environments</code></a>
-
diff --git a/website/docs/services/datazone/group_profiles/index.md b/website/docs/services/datazone/group_profiles/index.md
index 617302988..944fec4d3 100644
--- a/website/docs/services/datazone/group_profiles/index.md
+++ b/website/docs/services/datazone/group_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>group_profile</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain_id",
@@ -70,6 +79,28 @@ Creates, updates, deletes or gets a <code>group_profile</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": "The identifier of the Amazon DataZone domain in which the group profile is created."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the Amazon DataZone group profile."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-groupprofile.html"><code>AWS::DataZone::GroupProfile</code></a>.
 
@@ -79,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>group_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainIdentifier, GroupIdentifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>group_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>group_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>group_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>group_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>group_profile</code>.
 ```sql
 SELECT
@@ -125,6 +171,20 @@ status
 FROM awscc.datazone.group_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainId>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>group_profiles</code> in a region.
+```sql
+SELECT
+region,
+domain_id,
+id
+FROM awscc.datazone.group_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -195,6 +255,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datazone.group_profiles
+SET data__PatchDocument = string('{{ {
+    "Status": status
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainId>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/group_profiles_list_only/index.md b/website/docs/services/datazone/group_profiles_list_only/index.md
deleted file mode 100644
index 5b641b1c8..000000000
--- a/website/docs/services/datazone/group_profiles_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: group_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - group_profiles_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>group_profiles</code> in a region or regions, for all properties use <a href="/services/datazone/group_profiles/"><code>group_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>group_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Group profiles represent groups of Amazon DataZone users. Groups can be manually created, or mapped to Active Directory groups of enterprise customers. In Amazon DataZone, groups serve two purposes. First, a group can map to a team of users in the organizational chart, and thus reduce the administrative work of a Amazon DataZone project owner when there are new employees joining or leaving a team. Second, corporate administrators use Active Directory groups to manage and update user statuses and so Amazon DataZone domain administrators can use these group memberships to implement Amazon DataZone domain policies.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.group_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": "The identifier of the Amazon DataZone domain in which the group profile is created."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the Amazon DataZone group profile."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>group_profiles</code> in a region.
-```sql
-SELECT
-region,
-domain_id,
-id
-FROM awscc.datazone.group_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>group_profiles_list_only</code> resource, see <a href="/services/datazone/group_profiles/#permissions"><code>group_profiles</code></a>
-
diff --git a/website/docs/services/datazone/index.md b/website/docs/services/datazone/index.md
index 6d792da49..99418f48d 100644
--- a/website/docs/services/datazone/index.md
+++ b/website/docs/services/datazone/index.md
@@ -20,7 +20,7 @@ The datazone service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>32</b></span><br />
+<span>total resources:&nbsp;<b>16</b></span><br />
 </div>
 </div>
 
@@ -30,38 +30,22 @@ The datazone service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/datazone/connections/">connections</a><br />
-<a href="/services/datazone/connections_list_only/">connections_list_only</a><br />
 <a href="/services/datazone/data_sources/">data_sources</a><br />
-<a href="/services/datazone/data_sources_list_only/">data_sources_list_only</a><br />
 <a href="/services/datazone/domain_units/">domain_units</a><br />
-<a href="/services/datazone/domain_units_list_only/">domain_units_list_only</a><br />
 <a href="/services/datazone/domains/">domains</a><br />
-<a href="/services/datazone/domains_list_only/">domains_list_only</a><br />
 <a href="/services/datazone/environment_actions/">environment_actions</a><br />
-<a href="/services/datazone/environment_actions_list_only/">environment_actions_list_only</a><br />
 <a href="/services/datazone/environment_blueprint_configurations/">environment_blueprint_configurations</a><br />
-<a href="/services/datazone/environment_blueprint_configurations_list_only/">environment_blueprint_configurations_list_only</a><br />
 <a href="/services/datazone/environment_profiles/">environment_profiles</a><br />
-<a href="/services/datazone/environment_profiles_list_only/">environment_profiles_list_only</a><br />
-<a href="/services/datazone/environments/">environments</a><br />
-<a href="/services/datazone/environments_list_only/">environments_list_only</a>
+<a href="/services/datazone/environments/">environments</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/datazone/group_profiles/">group_profiles</a><br />
-<a href="/services/datazone/group_profiles_list_only/">group_profiles_list_only</a><br />
 <a href="/services/datazone/owners/">owners</a><br />
-<a href="/services/datazone/owners_list_only/">owners_list_only</a><br />
 <a href="/services/datazone/policy_grants/">policy_grants</a><br />
-<a href="/services/datazone/policy_grants_list_only/">policy_grants_list_only</a><br />
 <a href="/services/datazone/project_memberships/">project_memberships</a><br />
-<a href="/services/datazone/project_memberships_list_only/">project_memberships_list_only</a><br />
 <a href="/services/datazone/project_profiles/">project_profiles</a><br />
-<a href="/services/datazone/project_profiles_list_only/">project_profiles_list_only</a><br />
 <a href="/services/datazone/projects/">projects</a><br />
-<a href="/services/datazone/projects_list_only/">projects_list_only</a><br />
 <a href="/services/datazone/subscription_targets/">subscription_targets</a><br />
-<a href="/services/datazone/subscription_targets_list_only/">subscription_targets_list_only</a><br />
-<a href="/services/datazone/user_profiles/">user_profiles</a><br />
-<a href="/services/datazone/user_profiles_list_only/">user_profiles_list_only</a>
+<a href="/services/datazone/user_profiles/">user_profiles</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/datazone/owners/index.md b/website/docs/services/datazone/owners/index.md
index 6c6305657..817d0f064 100644
--- a/website/docs/services/datazone/owners/index.md
+++ b/website/docs/services/datazone/owners/index.md
@@ -33,6 +33,45 @@ Creates, updates, deletes or gets an <code>owner</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "entity_type",
+    "type": "string",
+    "description": "The type of an entity."
+  },
+  {
+    "name": "owner",
+    "type": "object",
+    "description": "The owner that you want to add to the entity."
+  },
+  {
+    "name": "entity_identifier",
+    "type": "string",
+    "description": "The ID of the entity to which you want to add an owner."
+  },
+  {
+    "name": "domain_identifier",
+    "type": "string",
+    "description": "The ID of the domain in which you want to add the entity owner."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "entity_type",
@@ -60,6 +99,8 @@ Creates, updates, deletes or gets an <code>owner</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-owner.html"><code>AWS::DataZone::Owner</code></a>.
 
@@ -69,26 +110,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>owners</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainIdentifier, EntityIdentifier, EntityType, Owner, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>owners</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>owners_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>owners</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +143,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>owner</code>.
 ```sql
 SELECT
@@ -108,6 +163,23 @@ domain_identifier
 FROM awscc.datazone.owners
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainIdentifier>|<EntityType>|<EntityIdentifier>|<OwnerType>|<OwnerIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>owners</code> in a region.
+```sql
+SELECT
+region,
+domain_identifier,
+entity_type,
+entity_identifier,
+owner_type,
+owner_identifier
+FROM awscc.datazone.owners_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -186,6 +258,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/owners_list_only/index.md b/website/docs/services/datazone/owners_list_only/index.md
deleted file mode 100644
index d7bbc7343..000000000
--- a/website/docs/services/datazone/owners_list_only/index.md
+++ /dev/null
@@ -1,99 +0,0 @@
----
-title: owners_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - owners_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>owners</code> in a region or regions, for all properties use <a href="/services/datazone/owners/"><code>owners</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>owners_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A owner can set up authorization permissions on their resources.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.owners_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "entity_type",
-    "type": "string",
-    "description": "The type of an entity."
-  },
-  {
-    "name": "owner",
-    "type": "object",
-    "description": "The owner that you want to add to the entity."
-  },
-  {
-    "name": "entity_identifier",
-    "type": "string",
-    "description": "The ID of the entity to which you want to add an owner."
-  },
-  {
-    "name": "domain_identifier",
-    "type": "string",
-    "description": "The ID of the domain in which you want to add the entity owner."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>owners</code> in a region.
-```sql
-SELECT
-region,
-domain_identifier,
-entity_type,
-entity_identifier,
-owner_type,
-owner_identifier
-FROM awscc.datazone.owners_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>owners_list_only</code> resource, see <a href="/services/datazone/owners/#permissions"><code>owners</code></a>
-
diff --git a/website/docs/services/datazone/policy_grants/index.md b/website/docs/services/datazone/policy_grants/index.md
index d5f3dbadd..0a800ea44 100644
--- a/website/docs/services/datazone/policy_grants/index.md
+++ b/website/docs/services/datazone/policy_grants/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>policy_grant</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "entity_type",
@@ -85,6 +94,43 @@ Creates, updates, deletes or gets a <code>policy_grant</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "entity_type",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "policy_type",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "grant_id",
+    "type": "string",
+    "description": "The unique identifier of the policy grant returned by the AddPolicyGrant API"
+  },
+  {
+    "name": "entity_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "domain_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-policygrant.html"><code>AWS::DataZone::PolicyGrant</code></a>.
 
@@ -94,26 +140,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>policy_grants</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainIdentifier, EntityIdentifier, EntityType, PolicyType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>policy_grants</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>policy_grants_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>policy_grants</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -122,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>policy_grant</code>.
 ```sql
 SELECT
@@ -138,6 +198,23 @@ domain_identifier
 FROM awscc.datazone.policy_grants
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainIdentifier>|<GrantId>|<EntityIdentifier>|<EntityType>|<PolicyType>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>policy_grants</code> in a region.
+```sql
+SELECT
+region,
+domain_identifier,
+grant_id,
+entity_identifier,
+entity_type,
+policy_type
+FROM awscc.datazone.policy_grants_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -224,6 +301,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/policy_grants_list_only/index.md b/website/docs/services/datazone/policy_grants_list_only/index.md
deleted file mode 100644
index 57b64ad1c..000000000
--- a/website/docs/services/datazone/policy_grants_list_only/index.md
+++ /dev/null
@@ -1,104 +0,0 @@
----
-title: policy_grants_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - policy_grants_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>policy_grants</code> in a region or regions, for all properties use <a href="/services/datazone/policy_grants/"><code>policy_grants</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>policy_grants_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Policy Grant in AWS DataZone is an explicit authorization assignment that allows a specific principal (user, group, or project) to perform particular actions (such as creating glossary terms, managing projects, or accessing resources) on governed resources within a certain scope (like a Domain Unit or Project). Policy Grants are essentially the mechanism by which DataZone enforces fine-grained, role-based access control beyond what is possible through AWS IAM alone.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.policy_grants_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "entity_type",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "policy_type",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "grant_id",
-    "type": "string",
-    "description": "The unique identifier of the policy grant returned by the AddPolicyGrant API"
-  },
-  {
-    "name": "entity_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "domain_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>policy_grants</code> in a region.
-```sql
-SELECT
-region,
-domain_identifier,
-grant_id,
-entity_identifier,
-entity_type,
-policy_type
-FROM awscc.datazone.policy_grants_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>policy_grants_list_only</code> resource, see <a href="/services/datazone/policy_grants/#permissions"><code>policy_grants</code></a>
-
diff --git a/website/docs/services/datazone/project_memberships/index.md b/website/docs/services/datazone/project_memberships/index.md
index e98093211..ddd2b8020 100644
--- a/website/docs/services/datazone/project_memberships/index.md
+++ b/website/docs/services/datazone/project_memberships/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>project_membership</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "project_identifier",
@@ -60,6 +69,33 @@ Creates, updates, deletes or gets a <code>project_membership</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "project_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "member",
+    "type": "object",
+    "description": ""
+  },
+  {
+    "name": "domain_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-projectmembership.html"><code>AWS::DataZone::ProjectMembership</code></a>.
 
@@ -69,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>project_memberships</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Designation, DomainIdentifier, ProjectIdentifier, Member, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>project_memberships</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>project_memberships</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>project_memberships_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>project_memberships</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>project_membership</code>.
 ```sql
 SELECT
@@ -113,6 +164,22 @@ domain_identifier
 FROM awscc.datazone.project_memberships
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainIdentifier>|<MemberIdentifier>|<MemberIdentifierType>|<ProjectIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>project_memberships</code> in a region.
+```sql
+SELECT
+region,
+domain_identifier,
+member_identifier,
+member_identifier_type,
+project_identifier
+FROM awscc.datazone.project_memberships_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -191,6 +258,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datazone.project_memberships
+SET data__PatchDocument = string('{{ {
+    "Designation": designation
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainIdentifier>|<MemberIdentifier>|<MemberIdentifierType>|<ProjectIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/project_memberships_list_only/index.md b/website/docs/services/datazone/project_memberships_list_only/index.md
deleted file mode 100644
index 53b225718..000000000
--- a/website/docs/services/datazone/project_memberships_list_only/index.md
+++ /dev/null
@@ -1,93 +0,0 @@
----
-title: project_memberships_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - project_memberships_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>project_memberships</code> in a region or regions, for all properties use <a href="/services/datazone/project_memberships/"><code>project_memberships</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>project_memberships_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::DataZone::ProjectMembership Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.project_memberships_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "project_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "member",
-    "type": "object",
-    "description": ""
-  },
-  {
-    "name": "domain_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>project_memberships</code> in a region.
-```sql
-SELECT
-region,
-domain_identifier,
-member_identifier,
-member_identifier_type,
-project_identifier
-FROM awscc.datazone.project_memberships_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>project_memberships_list_only</code> resource, see <a href="/services/datazone/project_memberships/#permissions"><code>project_memberships</code></a>
-
diff --git a/website/docs/services/datazone/project_profiles/index.md b/website/docs/services/datazone/project_profiles/index.md
index b171c4d91..fde100f0c 100644
--- a/website/docs/services/datazone/project_profiles/index.md
+++ b/website/docs/services/datazone/project_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>project_profile</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "created_at",
@@ -200,6 +209,38 @@ Creates, updates, deletes or gets a <code>project_profile</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "domain_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-projectprofile.html"><code>AWS::DataZone::ProjectProfile</code></a>.
 
@@ -209,31 +250,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>project_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>project_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>project_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>project_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>project_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -242,6 +289,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>project_profile</code>.
 ```sql
 SELECT
@@ -262,6 +318,20 @@ status
 FROM awscc.datazone.project_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainIdentifier>|<Identifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>project_profiles</code> in a region.
+```sql
+SELECT
+region,
+domain_identifier,
+identifier
+FROM awscc.datazone.project_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -360,6 +430,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datazone.project_profiles
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "DomainUnitIdentifier": domain_unit_identifier,
+    "Name": name,
+    "Status": status
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainIdentifier>|<Identifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/project_profiles_list_only/index.md b/website/docs/services/datazone/project_profiles_list_only/index.md
deleted file mode 100644
index f5006b711..000000000
--- a/website/docs/services/datazone/project_profiles_list_only/index.md
+++ /dev/null
@@ -1,96 +0,0 @@
----
-title: project_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - project_profiles_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>project_profiles</code> in a region or regions, for all properties use <a href="/services/datazone/project_profiles/"><code>project_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>project_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::DataZone::ProjectProfile Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.project_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "domain_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>project_profiles</code> in a region.
-```sql
-SELECT
-region,
-domain_identifier,
-identifier
-FROM awscc.datazone.project_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>project_profiles_list_only</code> resource, see <a href="/services/datazone/project_profiles/#permissions"><code>project_profiles</code></a>
-
diff --git a/website/docs/services/datazone/projects/index.md b/website/docs/services/datazone/projects/index.md
index 49e20354b..65ba068e0 100644
--- a/website/docs/services/datazone/projects/index.md
+++ b/website/docs/services/datazone/projects/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>project</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "created_at",
@@ -139,6 +148,28 @@ Creates, updates, deletes or gets a <code>project</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": "The identifier of the Amazon DataZone domain in which the project was created."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the Amazon DataZone project."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-project.html"><code>AWS::DataZone::Project</code></a>.
 
@@ -148,31 +179,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainIdentifier, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>projects_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -181,6 +218,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>project</code>.
 ```sql
 SELECT
@@ -202,6 +248,20 @@ user_parameters
 FROM awscc.datazone.projects
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainId>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>projects</code> in a region.
+```sql
+SELECT
+region,
+domain_id,
+id
+FROM awscc.datazone.projects_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -298,6 +358,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datazone.projects
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "DomainUnitId": domain_unit_id,
+    "GlossaryTerms": glossary_terms,
+    "Name": name,
+    "ProjectProfileVersion": project_profile_version,
+    "UserParameters": user_parameters
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainId>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/projects_list_only/index.md b/website/docs/services/datazone/projects_list_only/index.md
deleted file mode 100644
index b71a8c7a3..000000000
--- a/website/docs/services/datazone/projects_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: projects_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - projects_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>projects</code> in a region or regions, for all properties use <a href="/services/datazone/projects/"><code>projects</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>projects_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Amazon DataZone projects are business use case–based groupings of people, assets (data), and tools used to simplify access to the AWS analytics.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.projects_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": "The identifier of the Amazon DataZone domain in which the project was created."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the Amazon DataZone project."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>projects</code> in a region.
-```sql
-SELECT
-region,
-domain_id,
-id
-FROM awscc.datazone.projects_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>projects_list_only</code> resource, see <a href="/services/datazone/projects/#permissions"><code>projects</code></a>
-
diff --git a/website/docs/services/datazone/subscription_targets/index.md b/website/docs/services/datazone/subscription_targets/index.md
index 763d5c931..3b32ae188 100644
--- a/website/docs/services/datazone/subscription_targets/index.md
+++ b/website/docs/services/datazone/subscription_targets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>subscription_target</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "applicable_asset_types",
@@ -137,6 +146,33 @@ Creates, updates, deletes or gets a <code>subscription_target</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": "The ID of the Amazon DataZone domain in which subscription target is created."
+  },
+  {
+    "name": "environment_id",
+    "type": "string",
+    "description": "The ID of the environment in which subscription target is created."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the subscription target."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-subscriptiontarget.html"><code>AWS::DataZone::SubscriptionTarget</code></a>.
 
@@ -146,31 +182,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>subscription_targets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApplicableAssetTypes, AuthorizedPrincipals, DomainIdentifier, EnvironmentIdentifier, Name, SubscriptionTargetConfig, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>subscription_targets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>subscription_targets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>subscription_targets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>subscription_targets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -179,6 +221,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>subscription_target</code>.
 ```sql
 SELECT
@@ -203,6 +254,21 @@ updated_by
 FROM awscc.datazone.subscription_targets
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainId>|<EnvironmentId>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>subscription_targets</code> in a region.
+```sql
+SELECT
+region,
+domain_id,
+environment_id,
+id
+FROM awscc.datazone.subscription_targets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -311,6 +377,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datazone.subscription_targets
+SET data__PatchDocument = string('{{ {
+    "ApplicableAssetTypes": applicable_asset_types,
+    "AuthorizedPrincipals": authorized_principals,
+    "ManageAccessRole": manage_access_role,
+    "Name": name,
+    "Provider": provider,
+    "SubscriptionTargetConfig": subscription_target_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainId>|<EnvironmentId>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/subscription_targets_list_only/index.md b/website/docs/services/datazone/subscription_targets_list_only/index.md
deleted file mode 100644
index da751648b..000000000
--- a/website/docs/services/datazone/subscription_targets_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: subscription_targets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - subscription_targets_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>subscription_targets</code> in a region or regions, for all properties use <a href="/services/datazone/subscription_targets/"><code>subscription_targets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>subscription_targets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Subscription targets enables one to access the data to which you have subscribed in your projects.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.subscription_targets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": "The ID of the Amazon DataZone domain in which subscription target is created."
-  },
-  {
-    "name": "environment_id",
-    "type": "string",
-    "description": "The ID of the environment in which subscription target is created."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the subscription target."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>subscription_targets</code> in a region.
-```sql
-SELECT
-region,
-domain_id,
-environment_id,
-id
-FROM awscc.datazone.subscription_targets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>subscription_targets_list_only</code> resource, see <a href="/services/datazone/subscription_targets/#permissions"><code>subscription_targets</code></a>
-
diff --git a/website/docs/services/datazone/user_profiles/index.md b/website/docs/services/datazone/user_profiles/index.md
index f9f4549dc..fc7ecfe63 100644
--- a/website/docs/services/datazone/user_profiles/index.md
+++ b/website/docs/services/datazone/user_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>user_profile</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "details",
@@ -80,6 +89,28 @@ Creates, updates, deletes or gets an <code>user_profile</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": "The identifier of the Amazon DataZone domain in which the user profile is created."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the Amazon DataZone user profile."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-userprofile.html"><code>AWS::DataZone::UserProfile</code></a>.
 
@@ -89,31 +120,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>user_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainIdentifier, UserIdentifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>user_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>user_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>user_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>user_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -122,6 +159,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user_profile</code>.
 ```sql
 SELECT
@@ -137,6 +183,20 @@ user_type
 FROM awscc.datazone.user_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainId>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>user_profiles</code> in a region.
+```sql
+SELECT
+region,
+domain_id,
+id
+FROM awscc.datazone.user_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -211,6 +271,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.datazone.user_profiles
+SET data__PatchDocument = string('{{ {
+    "Status": status
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainId>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/datazone/user_profiles_list_only/index.md b/website/docs/services/datazone/user_profiles_list_only/index.md
deleted file mode 100644
index 7534faa9d..000000000
--- a/website/docs/services/datazone/user_profiles_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: user_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - user_profiles_list_only
-  - datazone
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>user_profiles</code> in a region or regions, for all properties use <a href="/services/datazone/user_profiles/"><code>user_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>user_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A user profile represents Amazon DataZone users. Amazon DataZone supports both IAM roles and SSO identities to interact with the Amazon DataZone Management Console and the data portal for different purposes. Domain administrators use IAM roles to perform the initial administrative domain-related work in the Amazon DataZone Management Console, including creating new Amazon DataZone domains, configuring metadata form types, and implementing policies. Data workers use their SSO corporate identities via Identity Center to log into the Amazon DataZone Data Portal and access projects where they have memberships.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.datazone.user_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": "The identifier of the Amazon DataZone domain in which the user profile is created."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the Amazon DataZone user profile."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>user_profiles</code> in a region.
-```sql
-SELECT
-region,
-domain_id,
-id
-FROM awscc.datazone.user_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>user_profiles_list_only</code> resource, see <a href="/services/datazone/user_profiles/#permissions"><code>user_profiles</code></a>
-
diff --git a/website/docs/services/deadline/farms/index.md b/website/docs/services/deadline/farms/index.md
index 9b6b9ebbd..ca5c8fc44 100644
--- a/website/docs/services/deadline/farms/index.md
+++ b/website/docs/services/deadline/farms/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>farm</code> resource or lists <code>fa
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>farm</code> resource or lists <code>fa
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-farm.html"><code>AWS::Deadline::Farm</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>farms</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DisplayName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>farms</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>farms</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>farms_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>farms</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>farm</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.deadline.farms
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>farms</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.deadline.farms_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -211,6 +265,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.deadline.farms
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "DisplayName": display_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/deadline/farms_list_only/index.md b/website/docs/services/deadline/farms_list_only/index.md
deleted file mode 100644
index bb9d631a4..000000000
--- a/website/docs/services/deadline/farms_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: farms_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - farms_list_only
-  - deadline
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>farms</code> in a region or regions, for all properties use <a href="/services/deadline/farms/"><code>farms</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>farms_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Deadline::Farm Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.deadline.farms_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>farms</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.deadline.farms_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>farms_list_only</code> resource, see <a href="/services/deadline/farms/#permissions"><code>farms</code></a>
-
diff --git a/website/docs/services/deadline/fleets/index.md b/website/docs/services/deadline/fleets/index.md
index 5d7e80fa4..47017777c 100644
--- a/website/docs/services/deadline/fleets/index.md
+++ b/website/docs/services/deadline/fleets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>fleet</code> resource or lists <code>f
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "capabilities",
@@ -180,6 +189,23 @@ Creates, updates, deletes or gets a <code>fleet</code> resource or lists <code>f
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-fleet.html"><code>AWS::Deadline::Fleet</code></a>.
 
@@ -189,31 +215,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Configuration, DisplayName, FarmId, MaxWorkerCount, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>fleets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -222,6 +254,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>fleet</code>.
 ```sql
 SELECT
@@ -244,6 +285,19 @@ tags
 FROM awscc.deadline.fleets
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>fleets</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.deadline.fleets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -348,6 +402,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.deadline.fleets
+SET data__PatchDocument = string('{{ {
+    "Configuration": configuration,
+    "Description": description,
+    "DisplayName": display_name,
+    "HostConfiguration": host_configuration,
+    "MaxWorkerCount": max_worker_count,
+    "MinWorkerCount": min_worker_count,
+    "RoleArn": role_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/deadline/fleets_list_only/index.md b/website/docs/services/deadline/fleets_list_only/index.md
deleted file mode 100644
index 259657b30..000000000
--- a/website/docs/services/deadline/fleets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: fleets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - fleets_list_only
-  - deadline
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>fleets</code> in a region or regions, for all properties use <a href="/services/deadline/fleets/"><code>fleets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>fleets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Deadline::Fleet Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.deadline.fleets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>fleets</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.deadline.fleets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>fleets_list_only</code> resource, see <a href="/services/deadline/fleets/#permissions"><code>fleets</code></a>
-
diff --git a/website/docs/services/deadline/index.md b/website/docs/services/deadline/index.md
index bd60f9fac..ce8ddf5db 100644
--- a/website/docs/services/deadline/index.md
+++ b/website/docs/services/deadline/index.md
@@ -20,7 +20,7 @@ The deadline service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>22</b></span><br />
+<span>total resources:&nbsp;<b>11</b></span><br />
 </div>
 </div>
 
@@ -30,28 +30,17 @@ The deadline service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/deadline/farms/">farms</a><br />
-<a href="/services/deadline/farms_list_only/">farms_list_only</a><br />
 <a href="/services/deadline/fleets/">fleets</a><br />
-<a href="/services/deadline/fleets_list_only/">fleets_list_only</a><br />
 <a href="/services/deadline/license_endpoints/">license_endpoints</a><br />
-<a href="/services/deadline/license_endpoints_list_only/">license_endpoints_list_only</a><br />
 <a href="/services/deadline/limits/">limits</a><br />
-<a href="/services/deadline/limits_list_only/">limits_list_only</a><br />
 <a href="/services/deadline/metered_products/">metered_products</a><br />
-<a href="/services/deadline/metered_products_list_only/">metered_products_list_only</a><br />
 <a href="/services/deadline/monitors/">monitors</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/deadline/monitors_list_only/">monitors_list_only</a><br />
 <a href="/services/deadline/queue_environments/">queue_environments</a><br />
-<a href="/services/deadline/queue_environments_list_only/">queue_environments_list_only</a><br />
 <a href="/services/deadline/queue_fleet_associations/">queue_fleet_associations</a><br />
-<a href="/services/deadline/queue_fleet_associations_list_only/">queue_fleet_associations_list_only</a><br />
 <a href="/services/deadline/queue_limit_associations/">queue_limit_associations</a><br />
-<a href="/services/deadline/queue_limit_associations_list_only/">queue_limit_associations_list_only</a><br />
 <a href="/services/deadline/queues/">queues</a><br />
-<a href="/services/deadline/queues_list_only/">queues_list_only</a><br />
-<a href="/services/deadline/storage_profiles/">storage_profiles</a><br />
-<a href="/services/deadline/storage_profiles_list_only/">storage_profiles_list_only</a>
+<a href="/services/deadline/storage_profiles/">storage_profiles</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/deadline/license_endpoints/index.md b/website/docs/services/deadline/license_endpoints/index.md
index d1022d6f1..1e52e5811 100644
--- a/website/docs/services/deadline/license_endpoints/index.md
+++ b/website/docs/services/deadline/license_endpoints/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>license_endpoint</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "dns_name",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>license_endpoint</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-licenseendpoint.html"><code>AWS::Deadline::LicenseEndpoint</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>license_endpoints</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SecurityGroupIds, SubnetIds, VpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>license_endpoints</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>license_endpoints</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>license_endpoints_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>license_endpoints</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>license_endpoint</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ tags
 FROM awscc.deadline.license_endpoints
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>license_endpoints</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.deadline.license_endpoints_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -235,6 +289,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.deadline.license_endpoints
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/deadline/license_endpoints_list_only/index.md b/website/docs/services/deadline/license_endpoints_list_only/index.md
deleted file mode 100644
index 666cc9fbb..000000000
--- a/website/docs/services/deadline/license_endpoints_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: license_endpoints_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - license_endpoints_list_only
-  - deadline
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>license_endpoints</code> in a region or regions, for all properties use <a href="/services/deadline/license_endpoints/"><code>license_endpoints</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>license_endpoints_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Deadline::LicenseEndpoint Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.deadline.license_endpoints_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>license_endpoints</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.deadline.license_endpoints_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>license_endpoints_list_only</code> resource, see <a href="/services/deadline/license_endpoints/#permissions"><code>license_endpoints</code></a>
-
diff --git a/website/docs/services/deadline/limits/index.md b/website/docs/services/deadline/limits/index.md
index f174c82e6..2529514f4 100644
--- a/website/docs/services/deadline/limits/index.md
+++ b/website/docs/services/deadline/limits/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>limit</code> resource or lists <code>l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "amount_requirement_name",
@@ -75,6 +84,28 @@ Creates, updates, deletes or gets a <code>limit</code> resource or lists <code>l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "farm_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "limit_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-limit.html"><code>AWS::Deadline::Limit</code></a>.
 
@@ -84,31 +115,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>limits</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AmountRequirementName, DisplayName, MaxCount, FarmId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>limits</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>limits</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>limits_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>limits</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +154,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>limit</code>.
 ```sql
 SELECT
@@ -131,6 +177,20 @@ max_count
 FROM awscc.deadline.limits
 WHERE region = 'us-east-1' AND data__Identifier = '<FarmId>|<LimitId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>limits</code> in a region.
+```sql
+SELECT
+region,
+farm_id,
+limit_id
+FROM awscc.deadline.limits_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -213,6 +273,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.deadline.limits
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "DisplayName": display_name,
+    "MaxCount": max_count
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FarmId>|<LimitId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/deadline/limits_list_only/index.md b/website/docs/services/deadline/limits_list_only/index.md
deleted file mode 100644
index 8e190e261..000000000
--- a/website/docs/services/deadline/limits_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: limits_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - limits_list_only
-  - deadline
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>limits</code> in a region or regions, for all properties use <a href="/services/deadline/limits/"><code>limits</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>limits_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Deadline::Limit Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.deadline.limits_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "farm_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "limit_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>limits</code> in a region.
-```sql
-SELECT
-region,
-farm_id,
-limit_id
-FROM awscc.deadline.limits_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>limits_list_only</code> resource, see <a href="/services/deadline/limits/#permissions"><code>limits</code></a>
-
diff --git a/website/docs/services/deadline/metered_products/index.md b/website/docs/services/deadline/metered_products/index.md
index 8ae88ad53..fbe1c4989 100644
--- a/website/docs/services/deadline/metered_products/index.md
+++ b/website/docs/services/deadline/metered_products/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>metered_product</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "license_endpoint_id",
@@ -70,6 +79,23 @@ Creates, updates, deletes or gets a <code>metered_product</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-meteredproduct.html"><code>AWS::Deadline::MeteredProduct</code></a>.
 
@@ -79,26 +105,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>metered_products</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>metered_products</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>metered_products_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>metered_products</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +138,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>metered_product</code>.
 ```sql
 SELECT
@@ -120,6 +160,19 @@ arn
 FROM awscc.deadline.metered_products
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>metered_products</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.deadline.metered_products_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -186,6 +239,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/deadline/metered_products_list_only/index.md b/website/docs/services/deadline/metered_products_list_only/index.md
deleted file mode 100644
index 595068a38..000000000
--- a/website/docs/services/deadline/metered_products_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: metered_products_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - metered_products_list_only
-  - deadline
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>metered_products</code> in a region or regions, for all properties use <a href="/services/deadline/metered_products/"><code>metered_products</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>metered_products_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Deadline::MeteredProduct Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.deadline.metered_products_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>metered_products</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.deadline.metered_products_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>metered_products_list_only</code> resource, see <a href="/services/deadline/metered_products/#permissions"><code>metered_products</code></a>
-
diff --git a/website/docs/services/deadline/monitors/index.md b/website/docs/services/deadline/monitors/index.md
index b93ceffce..ad68baff4 100644
--- a/website/docs/services/deadline/monitors/index.md
+++ b/website/docs/services/deadline/monitors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>monitor</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "display_name",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>monitor</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-monitor.html"><code>AWS::Deadline::Monitor</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>monitors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DisplayName, IdentityCenterInstanceArn, RoleArn, Subdomain, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>monitors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>monitors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>monitors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>monitors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>monitor</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ arn
 FROM awscc.deadline.monitors
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>monitors</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.deadline.monitors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -239,6 +293,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.deadline.monitors
+SET data__PatchDocument = string('{{ {
+    "DisplayName": display_name,
+    "RoleArn": role_arn,
+    "Subdomain": subdomain,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/deadline/monitors_list_only/index.md b/website/docs/services/deadline/monitors_list_only/index.md
deleted file mode 100644
index 3058da885..000000000
--- a/website/docs/services/deadline/monitors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: monitors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - monitors_list_only
-  - deadline
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>monitors</code> in a region or regions, for all properties use <a href="/services/deadline/monitors/"><code>monitors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>monitors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Deadline::Monitor Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.deadline.monitors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>monitors</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.deadline.monitors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>monitors_list_only</code> resource, see <a href="/services/deadline/monitors/#permissions"><code>monitors</code></a>
-
diff --git a/website/docs/services/deadline/queue_environments/index.md b/website/docs/services/deadline/queue_environments/index.md
index d23dd02f4..35793f3ae 100644
--- a/website/docs/services/deadline/queue_environments/index.md
+++ b/website/docs/services/deadline/queue_environments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>queue_environment</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "farm_id",
@@ -75,6 +84,33 @@ Creates, updates, deletes or gets a <code>queue_environment</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "farm_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "queue_environment_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "queue_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-queueenvironment.html"><code>AWS::Deadline::QueueEnvironment</code></a>.
 
@@ -84,31 +120,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>queue_environments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FarmId, QueueId, Priority, Template, TemplateType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>queue_environments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>queue_environments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>queue_environments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>queue_environments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +159,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>queue_environment</code>.
 ```sql
 SELECT
@@ -131,6 +182,21 @@ template_type
 FROM awscc.deadline.queue_environments
 WHERE region = 'us-east-1' AND data__Identifier = '<FarmId>|<QueueId>|<QueueEnvironmentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>queue_environments</code> in a region.
+```sql
+SELECT
+region,
+farm_id,
+queue_id,
+queue_environment_id
+FROM awscc.deadline.queue_environments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -215,6 +281,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.deadline.queue_environments
+SET data__PatchDocument = string('{{ {
+    "Priority": priority,
+    "Template": template,
+    "TemplateType": template_type
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FarmId>|<QueueId>|<QueueEnvironmentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/deadline/queue_environments_list_only/index.md b/website/docs/services/deadline/queue_environments_list_only/index.md
deleted file mode 100644
index a2ebd22d9..000000000
--- a/website/docs/services/deadline/queue_environments_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: queue_environments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - queue_environments_list_only
-  - deadline
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>queue_environments</code> in a region or regions, for all properties use <a href="/services/deadline/queue_environments/"><code>queue_environments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>queue_environments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Deadline::QueueEnvironment Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.deadline.queue_environments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "farm_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "queue_environment_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "queue_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>queue_environments</code> in a region.
-```sql
-SELECT
-region,
-farm_id,
-queue_id,
-queue_environment_id
-FROM awscc.deadline.queue_environments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>queue_environments_list_only</code> resource, see <a href="/services/deadline/queue_environments/#permissions"><code>queue_environments</code></a>
-
diff --git a/website/docs/services/deadline/queue_fleet_associations/index.md b/website/docs/services/deadline/queue_fleet_associations/index.md
index 984fb5f47..33366a775 100644
--- a/website/docs/services/deadline/queue_fleet_associations/index.md
+++ b/website/docs/services/deadline/queue_fleet_associations/index.md
@@ -33,6 +33,40 @@ Creates, updates, deletes or gets a <code>queue_fleet_association</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "farm_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "fleet_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "queue_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "farm_id",
@@ -55,6 +89,8 @@ Creates, updates, deletes or gets a <code>queue_fleet_association</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-queuefleetassociation.html"><code>AWS::Deadline::QueueFleetAssociation</code></a>.
 
@@ -64,26 +100,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>queue_fleet_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FarmId, FleetId, QueueId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>queue_fleet_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>queue_fleet_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>queue_fleet_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +133,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>queue_fleet_association</code>.
 ```sql
 SELECT
@@ -102,6 +152,21 @@ queue_id
 FROM awscc.deadline.queue_fleet_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<FarmId>|<FleetId>|<QueueId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>queue_fleet_associations</code> in a region.
+```sql
+SELECT
+region,
+farm_id,
+fleet_id,
+queue_id
+FROM awscc.deadline.queue_fleet_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -174,6 +239,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/deadline/queue_fleet_associations_list_only/index.md b/website/docs/services/deadline/queue_fleet_associations_list_only/index.md
deleted file mode 100644
index 9f7045d43..000000000
--- a/website/docs/services/deadline/queue_fleet_associations_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: queue_fleet_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - queue_fleet_associations_list_only
-  - deadline
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>queue_fleet_associations</code> in a region or regions, for all properties use <a href="/services/deadline/queue_fleet_associations/"><code>queue_fleet_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>queue_fleet_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Deadline::QueueFleetAssociation Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.deadline.queue_fleet_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "farm_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "fleet_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "queue_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>queue_fleet_associations</code> in a region.
-```sql
-SELECT
-region,
-farm_id,
-fleet_id,
-queue_id
-FROM awscc.deadline.queue_fleet_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>queue_fleet_associations_list_only</code> resource, see <a href="/services/deadline/queue_fleet_associations/#permissions"><code>queue_fleet_associations</code></a>
-
diff --git a/website/docs/services/deadline/queue_limit_associations/index.md b/website/docs/services/deadline/queue_limit_associations/index.md
index 20c97daa0..389d42c7a 100644
--- a/website/docs/services/deadline/queue_limit_associations/index.md
+++ b/website/docs/services/deadline/queue_limit_associations/index.md
@@ -33,6 +33,40 @@ Creates, updates, deletes or gets a <code>queue_limit_association</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "farm_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "limit_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "queue_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "farm_id",
@@ -55,6 +89,8 @@ Creates, updates, deletes or gets a <code>queue_limit_association</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-queuelimitassociation.html"><code>AWS::Deadline::QueueLimitAssociation</code></a>.
 
@@ -64,26 +100,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>queue_limit_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FarmId, LimitId, QueueId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>queue_limit_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>queue_limit_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>queue_limit_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +133,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>queue_limit_association</code>.
 ```sql
 SELECT
@@ -102,6 +152,21 @@ queue_id
 FROM awscc.deadline.queue_limit_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<FarmId>|<LimitId>|<QueueId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>queue_limit_associations</code> in a region.
+```sql
+SELECT
+region,
+farm_id,
+limit_id,
+queue_id
+FROM awscc.deadline.queue_limit_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -174,6 +239,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/deadline/queue_limit_associations_list_only/index.md b/website/docs/services/deadline/queue_limit_associations_list_only/index.md
deleted file mode 100644
index 6ddcac95f..000000000
--- a/website/docs/services/deadline/queue_limit_associations_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: queue_limit_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - queue_limit_associations_list_only
-  - deadline
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>queue_limit_associations</code> in a region or regions, for all properties use <a href="/services/deadline/queue_limit_associations/"><code>queue_limit_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>queue_limit_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Deadline::QueueLimitAssociation Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.deadline.queue_limit_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "farm_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "limit_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "queue_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>queue_limit_associations</code> in a region.
-```sql
-SELECT
-region,
-farm_id,
-limit_id,
-queue_id
-FROM awscc.deadline.queue_limit_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>queue_limit_associations_list_only</code> resource, see <a href="/services/deadline/queue_limit_associations/#permissions"><code>queue_limit_associations</code></a>
-
diff --git a/website/docs/services/deadline/queues/index.md b/website/docs/services/deadline/queues/index.md
index 71aae4df5..358e4c0d7 100644
--- a/website/docs/services/deadline/queues/index.md
+++ b/website/docs/services/deadline/queues/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>queue</code> resource or lists <code>q
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "allowed_storage_profile_ids",
@@ -165,6 +174,23 @@ Creates, updates, deletes or gets a <code>queue</code> resource or lists <code>q
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-queue.html"><code>AWS::Deadline::Queue</code></a>.
 
@@ -174,31 +200,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DisplayName, FarmId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>queues_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -207,6 +239,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>queue</code>.
 ```sql
 SELECT
@@ -226,6 +267,19 @@ tags
 FROM awscc.deadline.queues
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>queues</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.deadline.queues_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -337,6 +391,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.deadline.queues
+SET data__PatchDocument = string('{{ {
+    "AllowedStorageProfileIds": allowed_storage_profile_ids,
+    "DefaultBudgetAction": default_budget_action,
+    "Description": description,
+    "DisplayName": display_name,
+    "JobAttachmentSettings": job_attachment_settings,
+    "JobRunAsUser": job_run_as_user,
+    "RequiredFileSystemLocationNames": required_file_system_location_names,
+    "RoleArn": role_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/deadline/queues_list_only/index.md b/website/docs/services/deadline/queues_list_only/index.md
deleted file mode 100644
index 718f4c246..000000000
--- a/website/docs/services/deadline/queues_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: queues_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - queues_list_only
-  - deadline
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>queues</code> in a region or regions, for all properties use <a href="/services/deadline/queues/"><code>queues</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>queues_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Deadline::Queue Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.deadline.queues_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>queues</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.deadline.queues_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>queues_list_only</code> resource, see <a href="/services/deadline/queues/#permissions"><code>queues</code></a>
-
diff --git a/website/docs/services/deadline/storage_profiles/index.md b/website/docs/services/deadline/storage_profiles/index.md
index aa36dc5c7..49c0ce107 100644
--- a/website/docs/services/deadline/storage_profiles/index.md
+++ b/website/docs/services/deadline/storage_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>storage_profile</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "display_name",
@@ -82,6 +91,28 @@ Creates, updates, deletes or gets a <code>storage_profile</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "farm_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "storage_profile_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-storageprofile.html"><code>AWS::Deadline::StorageProfile</code></a>.
 
@@ -91,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>storage_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DisplayName, FarmId, OsFamily, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>storage_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>storage_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>storage_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>storage_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>storage_profile</code>.
 ```sql
 SELECT
@@ -136,6 +182,20 @@ storage_profile_id
 FROM awscc.deadline.storage_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<FarmId>|<StorageProfileId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>storage_profiles</code> in a region.
+```sql
+SELECT
+region,
+farm_id,
+storage_profile_id
+FROM awscc.deadline.storage_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -215,6 +275,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.deadline.storage_profiles
+SET data__PatchDocument = string('{{ {
+    "DisplayName": display_name,
+    "FileSystemLocations": file_system_locations,
+    "OsFamily": os_family
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FarmId>|<StorageProfileId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/deadline/storage_profiles_list_only/index.md b/website/docs/services/deadline/storage_profiles_list_only/index.md
deleted file mode 100644
index 4eb3fa016..000000000
--- a/website/docs/services/deadline/storage_profiles_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: storage_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - storage_profiles_list_only
-  - deadline
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>storage_profiles</code> in a region or regions, for all properties use <a href="/services/deadline/storage_profiles/"><code>storage_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>storage_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Deadline::StorageProfile Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.deadline.storage_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "farm_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "storage_profile_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>storage_profiles</code> in a region.
-```sql
-SELECT
-region,
-farm_id,
-storage_profile_id
-FROM awscc.deadline.storage_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>storage_profiles_list_only</code> resource, see <a href="/services/deadline/storage_profiles/#permissions"><code>storage_profiles</code></a>
-
diff --git a/website/docs/services/detective/graphs/index.md b/website/docs/services/detective/graphs/index.md
index f2369903f..66fca021c 100644
--- a/website/docs/services/detective/graphs/index.md
+++ b/website/docs/services/detective/graphs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>graph</code> resource or lists <code>g
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -67,6 +76,23 @@ Creates, updates, deletes or gets a <code>graph</code> resource or lists <code>g
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Detective graph ARN"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-detective-graph.html"><code>AWS::Detective::Graph</code></a>.
 
@@ -76,31 +102,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>graphs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>graphs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>graphs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>graphs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>graphs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -109,6 +141,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>graph</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ auto_enable_members
 FROM awscc.detective.graphs
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>graphs</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.detective.graphs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -187,6 +241,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.detective.graphs
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "AutoEnableMembers": auto_enable_members
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/detective/graphs_list_only/index.md b/website/docs/services/detective/graphs_list_only/index.md
deleted file mode 100644
index 9e93993f2..000000000
--- a/website/docs/services/detective/graphs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: graphs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - graphs_list_only
-  - detective
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>graphs</code> in a region or regions, for all properties use <a href="/services/detective/graphs/"><code>graphs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>graphs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Detective::Graph</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.detective.graphs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Detective graph ARN"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>graphs</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.detective.graphs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>graphs_list_only</code> resource, see <a href="/services/detective/graphs/#permissions"><code>graphs</code></a>
-
diff --git a/website/docs/services/detective/index.md b/website/docs/services/detective/index.md
index 2e9bd3c13..d79ebd75b 100644
--- a/website/docs/services/detective/index.md
+++ b/website/docs/services/detective/index.md
@@ -20,7 +20,7 @@ The detective service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The detective service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/detective/graphs/">graphs</a><br />
-<a href="/services/detective/graphs_list_only/">graphs_list_only</a><br />
 <a href="/services/detective/member_invitations/">member_invitations</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/detective/member_invitations_list_only/">member_invitations_list_only</a><br />
-<a href="/services/detective/organization_admins/">organization_admins</a><br />
-<a href="/services/detective/organization_admins_list_only/">organization_admins_list_only</a>
+<a href="/services/detective/organization_admins/">organization_admins</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/detective/member_invitations/index.md b/website/docs/services/detective/member_invitations/index.md
index ff74fced7..dffa3a99f 100644
--- a/website/docs/services/detective/member_invitations/index.md
+++ b/website/docs/services/detective/member_invitations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>member_invitation</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "graph_arn",
@@ -65,6 +74,28 @@ Creates, updates, deletes or gets a <code>member_invitation</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "graph_arn",
+    "type": "string",
+    "description": "The ARN of the graph to which the member account will be invited"
+  },
+  {
+    "name": "member_id",
+    "type": "string",
+    "description": "The AWS account ID to be invited to join the graph as a member"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-detective-memberinvitation.html"><code>AWS::Detective::MemberInvitation</code></a>.
 
@@ -74,26 +105,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>member_invitations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GraphArn, MemberId, MemberEmailAddress, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>member_invitations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>member_invitations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>member_invitations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +138,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>member_invitation</code>.
 ```sql
 SELECT
@@ -114,6 +159,20 @@ message
 FROM awscc.detective.member_invitations
 WHERE region = 'us-east-1' AND data__Identifier = '<GraphArn>|<MemberId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>member_invitations</code> in a region.
+```sql
+SELECT
+region,
+graph_arn,
+member_id
+FROM awscc.detective.member_invitations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -194,6 +253,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/detective/member_invitations_list_only/index.md b/website/docs/services/detective/member_invitations_list_only/index.md
deleted file mode 100644
index bf5399ce1..000000000
--- a/website/docs/services/detective/member_invitations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: member_invitations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - member_invitations_list_only
-  - detective
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>member_invitations</code> in a region or regions, for all properties use <a href="/services/detective/member_invitations/"><code>member_invitations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>member_invitations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Detective::MemberInvitation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.detective.member_invitations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "graph_arn",
-    "type": "string",
-    "description": "The ARN of the graph to which the member account will be invited"
-  },
-  {
-    "name": "member_id",
-    "type": "string",
-    "description": "The AWS account ID to be invited to join the graph as a member"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>member_invitations</code> in a region.
-```sql
-SELECT
-region,
-graph_arn,
-member_id
-FROM awscc.detective.member_invitations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>member_invitations_list_only</code> resource, see <a href="/services/detective/member_invitations/#permissions"><code>member_invitations</code></a>
-
diff --git a/website/docs/services/detective/organization_admins/index.md b/website/docs/services/detective/organization_admins/index.md
index 9430d3825..5ee23f551 100644
--- a/website/docs/services/detective/organization_admins/index.md
+++ b/website/docs/services/detective/organization_admins/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>organization_admin</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "account_id",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets an <code>organization_admin</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "account_id",
+    "type": "string",
+    "description": "The account ID of the account that should be registered as your Organization's delegated administrator for Detective"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-detective-organizationadmin.html"><code>AWS::Detective::OrganizationAdmin</code></a>.
 
@@ -59,26 +85,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>organization_admins</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AccountId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>organization_admins</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>organization_admins_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>organization_admins</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +118,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>organization_admin</code>.
 ```sql
 SELECT
@@ -96,6 +136,19 @@ graph_arn
 FROM awscc.detective.organization_admins
 WHERE region = 'us-east-1' AND data__Identifier = '<AccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>organization_admins</code> in a region.
+```sql
+SELECT
+region,
+account_id
+FROM awscc.detective.organization_admins_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -156,6 +209,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/detective/organization_admins_list_only/index.md b/website/docs/services/detective/organization_admins_list_only/index.md
deleted file mode 100644
index cf7d4df14..000000000
--- a/website/docs/services/detective/organization_admins_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: organization_admins_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - organization_admins_list_only
-  - detective
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>organization_admins</code> in a region or regions, for all properties use <a href="/services/detective/organization_admins/"><code>organization_admins</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>organization_admins_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Detective::OrganizationAdmin</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.detective.organization_admins_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "account_id",
-    "type": "string",
-    "description": "The account ID of the account that should be registered as your Organization's delegated administrator for Detective"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>organization_admins</code> in a region.
-```sql
-SELECT
-region,
-account_id
-FROM awscc.detective.organization_admins_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>organization_admins_list_only</code> resource, see <a href="/services/detective/organization_admins/#permissions"><code>organization_admins</code></a>
-
diff --git a/website/docs/services/devopsguru/index.md b/website/docs/services/devopsguru/index.md
index 8ada6cab8..a597e519e 100644
--- a/website/docs/services/devopsguru/index.md
+++ b/website/docs/services/devopsguru/index.md
@@ -20,7 +20,7 @@ The devopsguru service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The devopsguru service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/devopsguru/log_anomaly_detection_integrations/">log_anomaly_detection_integrations</a><br />
-<a href="/services/devopsguru/log_anomaly_detection_integrations_list_only/">log_anomaly_detection_integrations_list_only</a><br />
 <a href="/services/devopsguru/notification_channels/">notification_channels</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/devopsguru/notification_channels_list_only/">notification_channels_list_only</a><br />
-<a href="/services/devopsguru/resource_collections/">resource_collections</a><br />
-<a href="/services/devopsguru/resource_collections_list_only/">resource_collections_list_only</a>
+<a href="/services/devopsguru/resource_collections/">resource_collections</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/devopsguru/log_anomaly_detection_integrations/index.md b/website/docs/services/devopsguru/log_anomaly_detection_integrations/index.md
index 17440d72a..1acf0b5a6 100644
--- a/website/docs/services/devopsguru/log_anomaly_detection_integrations/index.md
+++ b/website/docs/services/devopsguru/log_anomaly_detection_integrations/index.md
@@ -33,6 +33,30 @@ Creates, updates, deletes or gets a <code>log_anomaly_detection_integration</cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "account_id",
+    "type": "string",
+    "description": "User account id, used as the primary identifier for the resource"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "account_id",
@@ -45,6 +69,8 @@ Creates, updates, deletes or gets a <code>log_anomaly_detection_integration</cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-devopsguru-loganomalydetectionintegration.html"><code>AWS::DevOpsGuru::LogAnomalyDetectionIntegration</code></a>.
 
@@ -54,31 +80,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>log_anomaly_detection_integrations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>log_anomaly_detection_integrations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>log_anomaly_detection_integrations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>log_anomaly_detection_integrations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>log_anomaly_detection_integrations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +119,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>log_anomaly_detection_integration</code>.
 ```sql
 SELECT
@@ -95,6 +136,19 @@ account_id
 FROM awscc.devopsguru.log_anomaly_detection_integrations
 WHERE region = 'us-east-1' AND data__Identifier = '<AccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>log_anomaly_detection_integrations</code> in a region.
+```sql
+SELECT
+region,
+account_id
+FROM awscc.devopsguru.log_anomaly_detection_integrations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -153,6 +207,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/devopsguru/log_anomaly_detection_integrations_list_only/index.md b/website/docs/services/devopsguru/log_anomaly_detection_integrations_list_only/index.md
deleted file mode 100644
index 5b90b48e4..000000000
--- a/website/docs/services/devopsguru/log_anomaly_detection_integrations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: log_anomaly_detection_integrations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - log_anomaly_detection_integrations_list_only
-  - devopsguru
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>log_anomaly_detection_integrations</code> in a region or regions, for all properties use <a href="/services/devopsguru/log_anomaly_detection_integrations/"><code>log_anomaly_detection_integrations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>log_anomaly_detection_integrations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This resource schema represents the LogAnomalyDetectionIntegration resource in the Amazon DevOps Guru.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.devopsguru.log_anomaly_detection_integrations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "account_id",
-    "type": "string",
-    "description": "User account id, used as the primary identifier for the resource"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>log_anomaly_detection_integrations</code> in a region.
-```sql
-SELECT
-region,
-account_id
-FROM awscc.devopsguru.log_anomaly_detection_integrations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>log_anomaly_detection_integrations_list_only</code> resource, see <a href="/services/devopsguru/log_anomaly_detection_integrations/#permissions"><code>log_anomaly_detection_integrations</code></a>
-
diff --git a/website/docs/services/devopsguru/notification_channels/index.md b/website/docs/services/devopsguru/notification_channels/index.md
index 0c1a5e169..0056cd3b8 100644
--- a/website/docs/services/devopsguru/notification_channels/index.md
+++ b/website/docs/services/devopsguru/notification_channels/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>notification_channel</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "config",
@@ -81,6 +90,23 @@ Creates, updates, deletes or gets a <code>notification_channel</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of a notification channel."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-devopsguru-notificationchannel.html"><code>AWS::DevOpsGuru::NotificationChannel</code></a>.
 
@@ -90,26 +116,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>notification_channels</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Config, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>notification_channels</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>notification_channels_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>notification_channels</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -118,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>notification_channel</code>.
 ```sql
 SELECT
@@ -127,6 +167,19 @@ id
 FROM awscc.devopsguru.notification_channels
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>notification_channels</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.devopsguru.notification_channels_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -194,6 +247,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/devopsguru/notification_channels_list_only/index.md b/website/docs/services/devopsguru/notification_channels_list_only/index.md
deleted file mode 100644
index 5279fc130..000000000
--- a/website/docs/services/devopsguru/notification_channels_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: notification_channels_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - notification_channels_list_only
-  - devopsguru
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>notification_channels</code> in a region or regions, for all properties use <a href="/services/devopsguru/notification_channels/"><code>notification_channels</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>notification_channels_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This resource schema represents the NotificationChannel resource in the Amazon DevOps Guru.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.devopsguru.notification_channels_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of a notification channel."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>notification_channels</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.devopsguru.notification_channels_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>notification_channels_list_only</code> resource, see <a href="/services/devopsguru/notification_channels/#permissions"><code>notification_channels</code></a>
-
diff --git a/website/docs/services/devopsguru/resource_collections/index.md b/website/docs/services/devopsguru/resource_collections/index.md
index 432c6ce18..76c25a091 100644
--- a/website/docs/services/devopsguru/resource_collections/index.md
+++ b/website/docs/services/devopsguru/resource_collections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_collection</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "resource_collection_filter",
@@ -81,6 +90,23 @@ Creates, updates, deletes or gets a <code>resource_collection</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "resource_collection_type",
+    "type": "string",
+    "description": "The type of ResourceCollection"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-devopsguru-resourcecollection.html"><code>AWS::DevOpsGuru::ResourceCollection</code></a>.
 
@@ -90,31 +116,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_collections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResourceCollectionFilter, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_collections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_collections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_collections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_collections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -123,6 +155,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_collection</code>.
 ```sql
 SELECT
@@ -132,6 +173,19 @@ resource_collection_type
 FROM awscc.devopsguru.resource_collections
 WHERE region = 'us-east-1' AND data__Identifier = '<ResourceCollectionType>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_collections</code> in a region.
+```sql
+SELECT
+region,
+resource_collection_type
+FROM awscc.devopsguru.resource_collections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -199,6 +253,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.devopsguru.resource_collections
+SET data__PatchDocument = string('{{ {
+    "ResourceCollectionFilter": resource_collection_filter
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ResourceCollectionType>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/devopsguru/resource_collections_list_only/index.md b/website/docs/services/devopsguru/resource_collections_list_only/index.md
deleted file mode 100644
index 18885e945..000000000
--- a/website/docs/services/devopsguru/resource_collections_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_collections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_collections_list_only
-  - devopsguru
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_collections</code> in a region or regions, for all properties use <a href="/services/devopsguru/resource_collections/"><code>resource_collections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_collections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This resource schema represents the ResourceCollection resource in the Amazon DevOps Guru.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.devopsguru.resource_collections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "resource_collection_type",
-    "type": "string",
-    "description": "The type of ResourceCollection"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_collections</code> in a region.
-```sql
-SELECT
-region,
-resource_collection_type
-FROM awscc.devopsguru.resource_collections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_collections_list_only</code> resource, see <a href="/services/devopsguru/resource_collections/#permissions"><code>resource_collections</code></a>
-
diff --git a/website/docs/services/directoryservice/index.md b/website/docs/services/directoryservice/index.md
index 1417124d9..52714d585 100644
--- a/website/docs/services/directoryservice/index.md
+++ b/website/docs/services/directoryservice/index.md
@@ -20,7 +20,7 @@ The directoryservice service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The directoryservice service documentation.
 <a href="/services/directoryservice/simple_ads/">simple_ads</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/directoryservice/simple_ads_list_only/">simple_ads_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/directoryservice/simple_ads/index.md b/website/docs/services/directoryservice/simple_ads/index.md
index db8e64a2b..ae269f08e 100644
--- a/website/docs/services/directoryservice/simple_ads/index.md
+++ b/website/docs/services/directoryservice/simple_ads/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>simple_ad</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "directory_id",
@@ -107,6 +116,23 @@ Creates, updates, deletes or gets a <code>simple_ad</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "directory_id",
+    "type": "string",
+    "description": "The unique identifier for a directory."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html"><code>AWS::DirectoryService::SimpleAD</code></a>.
 
@@ -116,31 +142,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>simple_ads</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VpcSettings, Size, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>simple_ads</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>simple_ads</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>simple_ads_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>simple_ads</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -149,6 +181,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>simple_ad</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ vpc_settings
 FROM awscc.directoryservice.simple_ads
 WHERE region = 'us-east-1' AND data__Identifier = '<DirectoryId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>simple_ads</code> in a region.
+```sql
+SELECT
+region,
+directory_id
+FROM awscc.directoryservice.simple_ads_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -262,6 +316,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.directoryservice.simple_ads
+SET data__PatchDocument = string('{{ {
+    "EnableSso": enable_sso
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DirectoryId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/directoryservice/simple_ads_list_only/index.md b/website/docs/services/directoryservice/simple_ads_list_only/index.md
deleted file mode 100644
index b2035d2c6..000000000
--- a/website/docs/services/directoryservice/simple_ads_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: simple_ads_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - simple_ads_list_only
-  - directoryservice
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>simple_ads</code> in a region or regions, for all properties use <a href="/services/directoryservice/simple_ads/"><code>simple_ads</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>simple_ads_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::DirectoryService::SimpleAD</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.directoryservice.simple_ads_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "directory_id",
-    "type": "string",
-    "description": "The unique identifier for a directory."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>simple_ads</code> in a region.
-```sql
-SELECT
-region,
-directory_id
-FROM awscc.directoryservice.simple_ads_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>simple_ads_list_only</code> resource, see <a href="/services/directoryservice/simple_ads/#permissions"><code>simple_ads</code></a>
-
diff --git a/website/docs/services/dms/data_migrations/index.md b/website/docs/services/dms/data_migrations/index.md
index 035017710..3c7b4c48c 100644
--- a/website/docs/services/dms/data_migrations/index.md
+++ b/website/docs/services/dms/data_migrations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_migration</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "data_migration_name",
@@ -141,6 +150,23 @@ Creates, updates, deletes or gets a <code>data_migration</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "data_migration_arn",
+    "type": "string",
+    "description": "The property describes an ARN of the data migration."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-datamigration.html"><code>AWS::DMS::DataMigration</code></a>.
 
@@ -150,31 +176,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_migrations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DataMigrationType, MigrationProjectIdentifier, ServiceAccessRoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_migrations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_migrations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_migrations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_migrations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -183,6 +215,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_migration</code>.
 ```sql
 SELECT
@@ -200,6 +241,19 @@ tags
 FROM awscc.dms.data_migrations
 WHERE region = 'us-east-1' AND data__Identifier = '<DataMigrationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_migrations</code> in a region.
+```sql
+SELECT
+region,
+data_migration_arn
+FROM awscc.dms.data_migrations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -301,6 +355,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.dms.data_migrations
+SET data__PatchDocument = string('{{ {
+    "DataMigrationName": data_migration_name,
+    "DataMigrationIdentifier": data_migration_identifier,
+    "ServiceAccessRoleArn": service_access_role_arn,
+    "MigrationProjectIdentifier": migration_project_identifier,
+    "DataMigrationType": data_migration_type,
+    "DataMigrationSettings": data_migration_settings,
+    "SourceDataSettings": source_data_settings,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DataMigrationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/dms/data_migrations_list_only/index.md b/website/docs/services/dms/data_migrations_list_only/index.md
deleted file mode 100644
index 5ea68a64d..000000000
--- a/website/docs/services/dms/data_migrations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: data_migrations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_migrations_list_only
-  - dms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_migrations</code> in a region or regions, for all properties use <a href="/services/dms/data_migrations/"><code>data_migrations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_migrations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DMS::DataMigration.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.dms.data_migrations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "data_migration_arn",
-    "type": "string",
-    "description": "The property describes an ARN of the data migration."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_migrations</code> in a region.
-```sql
-SELECT
-region,
-data_migration_arn
-FROM awscc.dms.data_migrations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_migrations_list_only</code> resource, see <a href="/services/dms/data_migrations/#permissions"><code>data_migrations</code></a>
-
diff --git a/website/docs/services/dms/data_providers/index.md b/website/docs/services/dms/data_providers/index.md
index 3500cf460..26ccf9108 100644
--- a/website/docs/services/dms/data_providers/index.md
+++ b/website/docs/services/dms/data_providers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_provider</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "data_provider_name",
@@ -439,6 +448,23 @@ Creates, updates, deletes or gets a <code>data_provider</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "data_provider_arn",
+    "type": "string",
+    "description": "The data provider ARN."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-dataprovider.html"><code>AWS::DMS::DataProvider</code></a>.
 
@@ -448,31 +474,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_providers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Engine, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_providers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_providers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_providers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_providers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -481,6 +513,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_provider</code>.
 ```sql
 SELECT
@@ -497,6 +538,19 @@ tags
 FROM awscc.dms.data_providers
 WHERE region = 'us-east-1' AND data__Identifier = '<DataProviderArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_providers</code> in a region.
+```sql
+SELECT
+region,
+data_provider_arn
+FROM awscc.dms.data_providers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -647,6 +701,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.dms.data_providers
+SET data__PatchDocument = string('{{ {
+    "DataProviderName": data_provider_name,
+    "DataProviderIdentifier": data_provider_identifier,
+    "Description": description,
+    "Engine": engine,
+    "ExactSettings": exact_settings,
+    "Settings": settings,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DataProviderArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/dms/data_providers_list_only/index.md b/website/docs/services/dms/data_providers_list_only/index.md
deleted file mode 100644
index f77fcf4cf..000000000
--- a/website/docs/services/dms/data_providers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: data_providers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_providers_list_only
-  - dms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_providers</code> in a region or regions, for all properties use <a href="/services/dms/data_providers/"><code>data_providers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_providers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DMS::DataProvider</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.dms.data_providers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "data_provider_arn",
-    "type": "string",
-    "description": "The data provider ARN."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_providers</code> in a region.
-```sql
-SELECT
-region,
-data_provider_arn
-FROM awscc.dms.data_providers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_providers_list_only</code> resource, see <a href="/services/dms/data_providers/#permissions"><code>data_providers</code></a>
-
diff --git a/website/docs/services/dms/index.md b/website/docs/services/dms/index.md
index f5ffb01c1..bb9631208 100644
--- a/website/docs/services/dms/index.md
+++ b/website/docs/services/dms/index.md
@@ -20,7 +20,7 @@ The dms service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>10</b></span><br />
+<span>total resources:&nbsp;<b>5</b></span><br />
 </div>
 </div>
 
@@ -30,16 +30,11 @@ The dms service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/dms/data_migrations/">data_migrations</a><br />
-<a href="/services/dms/data_migrations_list_only/">data_migrations_list_only</a><br />
 <a href="/services/dms/data_providers/">data_providers</a><br />
-<a href="/services/dms/data_providers_list_only/">data_providers_list_only</a><br />
 <a href="/services/dms/instance_profiles/">instance_profiles</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/dms/instance_profiles_list_only/">instance_profiles_list_only</a><br />
 <a href="/services/dms/migration_projects/">migration_projects</a><br />
-<a href="/services/dms/migration_projects_list_only/">migration_projects_list_only</a><br />
-<a href="/services/dms/replication_configs/">replication_configs</a><br />
-<a href="/services/dms/replication_configs_list_only/">replication_configs_list_only</a>
+<a href="/services/dms/replication_configs/">replication_configs</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/dms/instance_profiles/index.md b/website/docs/services/dms/instance_profiles/index.md
index 139f1f600..849d4842c 100644
--- a/website/docs/services/dms/instance_profiles/index.md
+++ b/website/docs/services/dms/instance_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>instance_profile</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_profile_arn",
@@ -112,6 +121,23 @@ Creates, updates, deletes or gets an <code>instance_profile</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "instance_profile_arn",
+    "type": "string",
+    "description": "The property describes an ARN of the instance profile."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-instanceprofile.html"><code>AWS::DMS::InstanceProfile</code></a>.
 
@@ -121,31 +147,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>instance_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>instance_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>instance_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>instance_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>instance_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -154,6 +186,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>instance_profile</code>.
 ```sql
 SELECT
@@ -173,6 +214,19 @@ tags
 FROM awscc.dms.instance_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<InstanceProfileArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>instance_profiles</code> in a region.
+```sql
+SELECT
+region,
+instance_profile_arn
+FROM awscc.dms.instance_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -290,6 +344,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.dms.instance_profiles
+SET data__PatchDocument = string('{{ {
+    "InstanceProfileIdentifier": instance_profile_identifier,
+    "AvailabilityZone": availability_zone,
+    "Description": description,
+    "KmsKeyArn": kms_key_arn,
+    "PubliclyAccessible": publicly_accessible,
+    "NetworkType": network_type,
+    "InstanceProfileName": instance_profile_name,
+    "SubnetGroupIdentifier": subnet_group_identifier,
+    "VpcSecurityGroups": vpc_security_groups,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InstanceProfileArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/dms/instance_profiles_list_only/index.md b/website/docs/services/dms/instance_profiles_list_only/index.md
deleted file mode 100644
index 01cbd3500..000000000
--- a/website/docs/services/dms/instance_profiles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: instance_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - instance_profiles_list_only
-  - dms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>instance_profiles</code> in a region or regions, for all properties use <a href="/services/dms/instance_profiles/"><code>instance_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>instance_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DMS::InstanceProfile.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.dms.instance_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "instance_profile_arn",
-    "type": "string",
-    "description": "The property describes an ARN of the instance profile."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>instance_profiles</code> in a region.
-```sql
-SELECT
-region,
-instance_profile_arn
-FROM awscc.dms.instance_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>instance_profiles_list_only</code> resource, see <a href="/services/dms/instance_profiles/#permissions"><code>instance_profiles</code></a>
-
diff --git a/website/docs/services/dms/migration_projects/index.md b/website/docs/services/dms/migration_projects/index.md
index a2f44cd6a..2392a9f9c 100644
--- a/website/docs/services/dms/migration_projects/index.md
+++ b/website/docs/services/dms/migration_projects/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>migration_project</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "migration_project_name",
@@ -156,6 +165,23 @@ Creates, updates, deletes or gets a <code>migration_project</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "migration_project_arn",
+    "type": "string",
+    "description": "The property describes an ARN of the migration project."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-migrationproject.html"><code>AWS::DMS::MigrationProject</code></a>.
 
@@ -165,31 +191,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>migration_projects</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>migration_projects</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>migration_projects</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>migration_projects_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>migration_projects</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -198,6 +230,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>migration_project</code>.
 ```sql
 SELECT
@@ -218,6 +259,19 @@ tags
 FROM awscc.dms.migration_projects
 WHERE region = 'us-east-1' AND data__Identifier = '<MigrationProjectArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>migration_projects</code> in a region.
+```sql
+SELECT
+region,
+migration_project_arn
+FROM awscc.dms.migration_projects_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -354,6 +408,30 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.dms.migration_projects
+SET data__PatchDocument = string('{{ {
+    "MigrationProjectName": migration_project_name,
+    "MigrationProjectIdentifier": migration_project_identifier,
+    "MigrationProjectCreationTime": migration_project_creation_time,
+    "InstanceProfileIdentifier": instance_profile_identifier,
+    "InstanceProfileName": instance_profile_name,
+    "InstanceProfileArn": instance_profile_arn,
+    "TransformationRules": transformation_rules,
+    "Description": description,
+    "SchemaConversionApplicationAttributes": schema_conversion_application_attributes,
+    "SourceDataProviderDescriptors": source_data_provider_descriptors,
+    "TargetDataProviderDescriptors": target_data_provider_descriptors,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<MigrationProjectArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/dms/migration_projects_list_only/index.md b/website/docs/services/dms/migration_projects_list_only/index.md
deleted file mode 100644
index bb883d022..000000000
--- a/website/docs/services/dms/migration_projects_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: migration_projects_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - migration_projects_list_only
-  - dms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>migration_projects</code> in a region or regions, for all properties use <a href="/services/dms/migration_projects/"><code>migration_projects</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>migration_projects_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::DMS::MigrationProject</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.dms.migration_projects_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "migration_project_arn",
-    "type": "string",
-    "description": "The property describes an ARN of the migration project."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>migration_projects</code> in a region.
-```sql
-SELECT
-region,
-migration_project_arn
-FROM awscc.dms.migration_projects_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>migration_projects_list_only</code> resource, see <a href="/services/dms/migration_projects/#permissions"><code>migration_projects</code></a>
-
diff --git a/website/docs/services/dms/replication_configs/index.md b/website/docs/services/dms/replication_configs/index.md
index d2b72c0be..4bdf7946a 100644
--- a/website/docs/services/dms/replication_configs/index.md
+++ b/website/docs/services/dms/replication_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>replication_config</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "replication_config_identifier",
@@ -154,6 +163,23 @@ Creates, updates, deletes or gets a <code>replication_config</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "replication_config_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the Replication Config"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationconfig.html"><code>AWS::DMS::ReplicationConfig</code></a>.
 
@@ -163,31 +189,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>replication_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ReplicationConfigIdentifier, SourceEndpointArn, TargetEndpointArn, ReplicationType, ComputeConfig, TableMappings, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>replication_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>replication_configs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>replication_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>replication_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -196,6 +228,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>replication_config</code>.
 ```sql
 SELECT
@@ -214,6 +255,19 @@ tags
 FROM awscc.dms.replication_configs
 WHERE region = 'us-east-1' AND data__Identifier = '<ReplicationConfigArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>replication_configs</code> in a region.
+```sql
+SELECT
+region,
+replication_config_arn
+FROM awscc.dms.replication_configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -332,6 +386,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.dms.replication_configs
+SET data__PatchDocument = string('{{ {
+    "ReplicationConfigIdentifier": replication_config_identifier,
+    "SourceEndpointArn": source_endpoint_arn,
+    "TargetEndpointArn": target_endpoint_arn,
+    "ReplicationType": replication_type,
+    "ComputeConfig": compute_config,
+    "ReplicationSettings": replication_settings,
+    "SupplementalSettings": supplemental_settings,
+    "TableMappings": table_mappings,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ReplicationConfigArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/dms/replication_configs_list_only/index.md b/website/docs/services/dms/replication_configs_list_only/index.md
deleted file mode 100644
index 3ca639f02..000000000
--- a/website/docs/services/dms/replication_configs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: replication_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - replication_configs_list_only
-  - dms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>replication_configs</code> in a region or regions, for all properties use <a href="/services/dms/replication_configs/"><code>replication_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>replication_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A replication configuration that you later provide to configure and start a AWS DMS Serverless replication</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.dms.replication_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "replication_config_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the Replication Config"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>replication_configs</code> in a region.
-```sql
-SELECT
-region,
-replication_config_arn
-FROM awscc.dms.replication_configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>replication_configs_list_only</code> resource, see <a href="/services/dms/replication_configs/#permissions"><code>replication_configs</code></a>
-
diff --git a/website/docs/services/docdbelastic/clusters/index.md b/website/docs/services/docdbelastic/clusters/index.md
index 46e8e9b2b..fd5a3dc7f 100644
--- a/website/docs/services/docdbelastic/clusters/index.md
+++ b/website/docs/services/docdbelastic/clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cluster_name",
@@ -132,6 +141,23 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdbelastic-cluster.html"><code>AWS::DocDBElastic::Cluster</code></a>.
 
@@ -141,31 +167,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ClusterName, AdminUserName, ShardCapacity, ShardCount, AuthType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -174,6 +206,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cluster</code>.
 ```sql
 SELECT
@@ -197,6 +238,19 @@ auth_type
 FROM awscc.docdbelastic.clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<ClusterArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>clusters</code> in a region.
+```sql
+SELECT
+region,
+cluster_arn
+FROM awscc.docdbelastic.clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -321,6 +375,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.docdbelastic.clusters
+SET data__PatchDocument = string('{{ {
+    "AdminUserPassword": admin_user_password,
+    "ShardCapacity": shard_capacity,
+    "ShardCount": shard_count,
+    "VpcSecurityGroupIds": vpc_security_group_ids,
+    "SubnetIds": subnet_ids,
+    "PreferredMaintenanceWindow": preferred_maintenance_window,
+    "PreferredBackupWindow": preferred_backup_window,
+    "BackupRetentionPeriod": backup_retention_period,
+    "ShardInstanceCount": shard_instance_count,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ClusterArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/docdbelastic/clusters_list_only/index.md b/website/docs/services/docdbelastic/clusters_list_only/index.md
deleted file mode 100644
index fc9bc5c19..000000000
--- a/website/docs/services/docdbelastic/clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - clusters_list_only
-  - docdbelastic
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>clusters</code> in a region or regions, for all properties use <a href="/services/docdbelastic/clusters/"><code>clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::DocDBElastic::Cluster Amazon DocumentDB (with MongoDB compatibility) Elastic Scale resource describes a Cluster</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.docdbelastic.clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cluster_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>clusters</code> in a region.
-```sql
-SELECT
-region,
-cluster_arn
-FROM awscc.docdbelastic.clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>clusters_list_only</code> resource, see <a href="/services/docdbelastic/clusters/#permissions"><code>clusters</code></a>
-
diff --git a/website/docs/services/docdbelastic/index.md b/website/docs/services/docdbelastic/index.md
index d10f993a2..d93879b56 100644
--- a/website/docs/services/docdbelastic/index.md
+++ b/website/docs/services/docdbelastic/index.md
@@ -20,7 +20,7 @@ The docdbelastic service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The docdbelastic service documentation.
 <a href="/services/docdbelastic/clusters/">clusters</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/docdbelastic/clusters_list_only/">clusters_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/dsql/clusters/index.md b/website/docs/services/dsql/clusters/index.md
index 604a613d5..9a2e553fa 100644
--- a/website/docs/services/dsql/clusters/index.md
+++ b/website/docs/services/dsql/clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "deletion_protection_enabled",
@@ -131,6 +140,23 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "identifier",
+    "type": "string",
+    "description": "The ID of the created cluster."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dsql-cluster.html"><code>AWS::DSQL::Cluster</code></a>.
 
@@ -140,31 +166,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -173,6 +205,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cluster</code>.
 ```sql
 SELECT
@@ -190,6 +231,19 @@ encryption_details
 FROM awscc.dsql.clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<Identifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>clusters</code> in a region.
+```sql
+SELECT
+region,
+identifier
+FROM awscc.dsql.clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -267,6 +321,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.dsql.clusters
+SET data__PatchDocument = string('{{ {
+    "DeletionProtectionEnabled": deletion_protection_enabled,
+    "Tags": tags,
+    "MultiRegionProperties": multi_region_properties,
+    "KmsEncryptionKey": kms_encryption_key
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Identifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/dsql/clusters_list_only/index.md b/website/docs/services/dsql/clusters_list_only/index.md
deleted file mode 100644
index acab1085e..000000000
--- a/website/docs/services/dsql/clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - clusters_list_only
-  - dsql
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>clusters</code> in a region or regions, for all properties use <a href="/services/dsql/clusters/"><code>clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::DSQL::Cluster</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.dsql.clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "identifier",
-    "type": "string",
-    "description": "The ID of the created cluster."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>clusters</code> in a region.
-```sql
-SELECT
-region,
-identifier
-FROM awscc.dsql.clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>clusters_list_only</code> resource, see <a href="/services/dsql/clusters/#permissions"><code>clusters</code></a>
-
diff --git a/website/docs/services/dsql/index.md b/website/docs/services/dsql/index.md
index 61236287b..a3ed85aa7 100644
--- a/website/docs/services/dsql/index.md
+++ b/website/docs/services/dsql/index.md
@@ -20,7 +20,7 @@ The dsql service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The dsql service documentation.
 <a href="/services/dsql/clusters/">clusters</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/dsql/clusters_list_only/">clusters_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/dynamodb/global_tables/index.md b/website/docs/services/dynamodb/global_tables/index.md
index 93ea71e4b..d54557c21 100644
--- a/website/docs/services/dynamodb/global_tables/index.md
+++ b/website/docs/services/dynamodb/global_tables/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>global_table</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "multi_region_consistency",
@@ -620,6 +629,23 @@ Creates, updates, deletes or gets a <code>global_table</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "table_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html"><code>AWS::DynamoDB::GlobalTable</code></a>.
 
@@ -629,31 +655,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>global_tables</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="KeySchema, AttributeDefinitions, Replicas, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>global_tables</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>global_tables</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>global_tables_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>global_tables</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -662,6 +694,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>global_table</code>.
 ```sql
 SELECT
@@ -687,6 +728,19 @@ time_to_live_specification
 FROM awscc.dynamodb.global_tables
 WHERE region = 'us-east-1' AND data__Identifier = '<TableName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>global_tables</code> in a region.
+```sql
+SELECT
+region,
+table_name
+FROM awscc.dynamodb.global_tables_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -881,6 +935,30 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.dynamodb.global_tables
+SET data__PatchDocument = string('{{ {
+    "MultiRegionConsistency": multi_region_consistency,
+    "SSESpecification": sse_specification,
+    "StreamSpecification": stream_specification,
+    "WarmThroughput": warm_throughput,
+    "Replicas": replicas,
+    "WriteProvisionedThroughputSettings": write_provisioned_throughput_settings,
+    "WriteOnDemandThroughputSettings": write_on_demand_throughput_settings,
+    "GlobalTableWitnesses": global_table_witnesses,
+    "AttributeDefinitions": attribute_definitions,
+    "BillingMode": billing_mode,
+    "GlobalSecondaryIndexes": global_secondary_indexes,
+    "TimeToLiveSpecification": time_to_live_specification
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TableName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/dynamodb/global_tables_list_only/index.md b/website/docs/services/dynamodb/global_tables_list_only/index.md
deleted file mode 100644
index fb426de8a..000000000
--- a/website/docs/services/dynamodb/global_tables_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: global_tables_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - global_tables_list_only
-  - dynamodb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>global_tables</code> in a region or regions, for all properties use <a href="/services/dynamodb/global_tables/"><code>global_tables</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>global_tables_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Version: None. Resource Type definition for AWS::DynamoDB::GlobalTable</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.dynamodb.global_tables_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "table_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>global_tables</code> in a region.
-```sql
-SELECT
-region,
-table_name
-FROM awscc.dynamodb.global_tables_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>global_tables_list_only</code> resource, see <a href="/services/dynamodb/global_tables/#permissions"><code>global_tables</code></a>
-
diff --git a/website/docs/services/dynamodb/index.md b/website/docs/services/dynamodb/index.md
index a7ed4bd8f..c113fbf9e 100644
--- a/website/docs/services/dynamodb/index.md
+++ b/website/docs/services/dynamodb/index.md
@@ -20,7 +20,7 @@ The dynamodb service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The dynamodb service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/dynamodb/global_tables/">global_tables</a><br />
-<a href="/services/dynamodb/global_tables_list_only/">global_tables_list_only</a>
+<a href="/services/dynamodb/global_tables/">global_tables</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/dynamodb/tables/">tables</a><br />
-<a href="/services/dynamodb/tables_list_only/">tables_list_only</a>
+<a href="/services/dynamodb/tables/">tables</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/dynamodb/tables/index.md b/website/docs/services/dynamodb/tables/index.md
index 3e78664d0..c9cd85a07 100644
--- a/website/docs/services/dynamodb/tables/index.md
+++ b/website/docs/services/dynamodb/tables/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>table</code> resource or lists <code>t
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "on_demand_throughput",
@@ -441,6 +450,23 @@ Creates, updates, deletes or gets a <code>table</code> resource or lists <code>t
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "table_name",
+    "type": "string",
+    "description": "A name for the table. If you don't specify a name, CFNlong generates a unique physical ID and uses that ID for the table name. For more information, see &#91;Name Type&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-name.html).<br />If you specify a name, you cannot perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html"><code>AWS::DynamoDB::Table</code></a>.
 
@@ -450,31 +476,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="KeySchema, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>tables_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -483,6 +515,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>table</code>.
 ```sql
 SELECT
@@ -512,6 +553,19 @@ time_to_live_specification
 FROM awscc.dynamodb.tables
 WHERE region = 'us-east-1' AND data__Identifier = '<TableName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>tables</code> in a region.
+```sql
+SELECT
+region,
+table_name
+FROM awscc.dynamodb.tables_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -699,6 +753,36 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.dynamodb.tables
+SET data__PatchDocument = string('{{ {
+    "OnDemandThroughput": on_demand_throughput,
+    "SSESpecification": sse_specification,
+    "KinesisStreamSpecification": kinesis_stream_specification,
+    "StreamSpecification": stream_specification,
+    "ContributorInsightsSpecification": contributor_insights_specification,
+    "PointInTimeRecoverySpecification": point_in_time_recovery_specification,
+    "ProvisionedThroughput": provisioned_throughput,
+    "WarmThroughput": warm_throughput,
+    "AttributeDefinitions": attribute_definitions,
+    "BillingMode": billing_mode,
+    "GlobalSecondaryIndexes": global_secondary_indexes,
+    "ResourcePolicy": resource_policy,
+    "KeySchema": key_schema,
+    "LocalSecondaryIndexes": local_secondary_indexes,
+    "DeletionProtectionEnabled": deletion_protection_enabled,
+    "TableClass": table_class,
+    "Tags": tags,
+    "TimeToLiveSpecification": time_to_live_specification
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TableName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/dynamodb/tables_list_only/index.md b/website/docs/services/dynamodb/tables_list_only/index.md
deleted file mode 100644
index 18f698aa4..000000000
--- a/website/docs/services/dynamodb/tables_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: tables_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - tables_list_only
-  - dynamodb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>tables</code> in a region or regions, for all properties use <a href="/services/dynamodb/tables/"><code>tables</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>tables_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::DynamoDB::Table&#96;&#96; resource creates a DDB table. For more information, see &#91;CreateTable&#93;(https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API&#95;CreateTable.html) in the &#42;API Reference&#42;.<br />You should be aware of the following behaviors when working with DDB tables:<br />+ CFNlong typically creates DDB tables in parallel. However, if your template includes multiple DDB tables with indexes, you must declare dependencies so that the tables are created sequentially. DDBlong limits the number of tables with secondary indexes that are in the creating state. If you create multiple tables with indexes at the same time, DDB returns an error and the stack operation fails. For an example, see &#91;DynamoDB Table with a DependsOn Attribute&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#aws-resource-dynamodb-table--examples--DynamoDB&#95;Table&#95;with&#95;a&#95;DependsOn&#95;Attribute).<br /><br />Our guidance is to use the latest schema documented for your CFNlong templates. This schema supports the provisioning of all table settings below. When using this schema in your CFNlong templates, please ensure that your Identity and Access Management (IAM) policies are updated with appropriate permissions to allow for the authorization of these setting changes.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.dynamodb.tables_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "table_name",
-    "type": "string",
-    "description": "A name for the table. If you don't specify a name, CFNlong generates a unique physical ID and uses that ID for the table name. For more information, see &#91;Name Type&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-name.html).<br />If you specify a name, you cannot perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>tables</code> in a region.
-```sql
-SELECT
-region,
-table_name
-FROM awscc.dynamodb.tables_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>tables_list_only</code> resource, see <a href="/services/dynamodb/tables/#permissions"><code>tables</code></a>
-
diff --git a/website/docs/services/ec2/capacity_reservation_fleets/index.md b/website/docs/services/ec2/capacity_reservation_fleets/index.md
index 2791567a1..5022a878d 100644
--- a/website/docs/services/ec2/capacity_reservation_fleets/index.md
+++ b/website/docs/services/ec2/capacity_reservation_fleets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>capacity_reservation_fleet</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "allocation_strategy",
@@ -151,6 +160,23 @@ Creates, updates, deletes or gets a <code>capacity_reservation_fleet</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "capacity_reservation_fleet_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservationfleet.html"><code>AWS::EC2::CapacityReservationFleet</code></a>.
 
@@ -160,31 +186,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>capacity_reservation_fleets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>capacity_reservation_fleets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>capacity_reservation_fleets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>capacity_reservation_fleets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>capacity_reservation_fleets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -193,6 +225,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>capacity_reservation_fleet</code>.
 ```sql
 SELECT
@@ -210,6 +251,19 @@ no_remove_end_date
 FROM awscc.ec2.capacity_reservation_fleets
 WHERE region = 'us-east-1' AND data__Identifier = '<CapacityReservationFleetId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>capacity_reservation_fleets</code> in a region.
+```sql
+SELECT
+region,
+capacity_reservation_fleet_id
+FROM awscc.ec2.capacity_reservation_fleets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -329,6 +383,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.capacity_reservation_fleets
+SET data__PatchDocument = string('{{ {
+    "TotalTargetCapacity": total_target_capacity,
+    "RemoveEndDate": remove_end_date,
+    "NoRemoveEndDate": no_remove_end_date
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CapacityReservationFleetId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/capacity_reservation_fleets_list_only/index.md b/website/docs/services/ec2/capacity_reservation_fleets_list_only/index.md
deleted file mode 100644
index dab02d870..000000000
--- a/website/docs/services/ec2/capacity_reservation_fleets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: capacity_reservation_fleets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - capacity_reservation_fleets_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>capacity_reservation_fleets</code> in a region or regions, for all properties use <a href="/services/ec2/capacity_reservation_fleets/"><code>capacity_reservation_fleets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>capacity_reservation_fleets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::CapacityReservationFleet</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.capacity_reservation_fleets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "capacity_reservation_fleet_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>capacity_reservation_fleets</code> in a region.
-```sql
-SELECT
-region,
-capacity_reservation_fleet_id
-FROM awscc.ec2.capacity_reservation_fleets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>capacity_reservation_fleets_list_only</code> resource, see <a href="/services/ec2/capacity_reservation_fleets/#permissions"><code>capacity_reservation_fleets</code></a>
-
diff --git a/website/docs/services/ec2/capacity_reservations/index.md b/website/docs/services/ec2/capacity_reservations/index.md
index 3c2c2eaf4..1a4576105 100644
--- a/website/docs/services/ec2/capacity_reservations/index.md
+++ b/website/docs/services/ec2/capacity_reservations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>capacity_reservation</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "tenancy",
@@ -228,6 +237,23 @@ Creates, updates, deletes or gets a <code>capacity_reservation</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html"><code>AWS::EC2::CapacityReservation</code></a>.
 
@@ -237,31 +263,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>capacity_reservations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceCount, InstancePlatform, InstanceType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>capacity_reservations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>capacity_reservations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>capacity_reservations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>capacity_reservations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -270,6 +302,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>capacity_reservation</code>.
 ```sql
 SELECT
@@ -305,6 +346,19 @@ commitment_info
 FROM awscc.ec2.capacity_reservations
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>capacity_reservations</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.capacity_reservations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -429,6 +483,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.capacity_reservations
+SET data__PatchDocument = string('{{ {
+    "EndDateType": end_date_type,
+    "EndDate": end_date,
+    "InstanceCount": instance_count,
+    "InstanceMatchCriteria": instance_match_criteria,
+    "UnusedReservationBillingOwnerId": unused_reservation_billing_owner_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/capacity_reservations_list_only/index.md b/website/docs/services/ec2/capacity_reservations_list_only/index.md
deleted file mode 100644
index bfe6b4ea1..000000000
--- a/website/docs/services/ec2/capacity_reservations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: capacity_reservations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - capacity_reservations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>capacity_reservations</code> in a region or regions, for all properties use <a href="/services/ec2/capacity_reservations/"><code>capacity_reservations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>capacity_reservations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::CapacityReservation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.capacity_reservations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>capacity_reservations</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.capacity_reservations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>capacity_reservations_list_only</code> resource, see <a href="/services/ec2/capacity_reservations/#permissions"><code>capacity_reservations</code></a>
-
diff --git a/website/docs/services/ec2/carrier_gateways/index.md b/website/docs/services/ec2/carrier_gateways/index.md
index 070e7cfcc..4346045bd 100644
--- a/website/docs/services/ec2/carrier_gateways/index.md
+++ b/website/docs/services/ec2/carrier_gateways/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>carrier_gateway</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "carrier_gateway_id",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>carrier_gateway</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "carrier_gateway_id",
+    "type": "string",
+    "description": "The ID of the carrier gateway."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-carriergateway.html"><code>AWS::EC2::CarrierGateway</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>carrier_gateways</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>carrier_gateways</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>carrier_gateways</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>carrier_gateways_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>carrier_gateways</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>carrier_gateway</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.ec2.carrier_gateways
 WHERE region = 'us-east-1' AND data__Identifier = '<CarrierGatewayId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>carrier_gateways</code> in a region.
+```sql
+SELECT
+region,
+carrier_gateway_id
+FROM awscc.ec2.carrier_gateways_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -197,6 +251,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.carrier_gateways
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CarrierGatewayId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/carrier_gateways_list_only/index.md b/website/docs/services/ec2/carrier_gateways_list_only/index.md
deleted file mode 100644
index a0e6832d4..000000000
--- a/website/docs/services/ec2/carrier_gateways_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: carrier_gateways_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - carrier_gateways_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>carrier_gateways</code> in a region or regions, for all properties use <a href="/services/ec2/carrier_gateways/"><code>carrier_gateways</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>carrier_gateways_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for Carrier Gateway which describes the Carrier Gateway resource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.carrier_gateways_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "carrier_gateway_id",
-    "type": "string",
-    "description": "The ID of the carrier gateway."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>carrier_gateways</code> in a region.
-```sql
-SELECT
-region,
-carrier_gateway_id
-FROM awscc.ec2.carrier_gateways_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>carrier_gateways_list_only</code> resource, see <a href="/services/ec2/carrier_gateways/#permissions"><code>carrier_gateways</code></a>
-
diff --git a/website/docs/services/ec2/customer_gateways/index.md b/website/docs/services/ec2/customer_gateways/index.md
index 57695fd73..917db452e 100644
--- a/website/docs/services/ec2/customer_gateways/index.md
+++ b/website/docs/services/ec2/customer_gateways/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>customer_gateway</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "type",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>customer_gateway</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "customer_gateway_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customergateway.html"><code>AWS::EC2::CustomerGateway</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>customer_gateways</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IpAddress, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>customer_gateways</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>customer_gateways</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>customer_gateways_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>customer_gateways</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>customer_gateway</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ device_name
 FROM awscc.ec2.customer_gateways
 WHERE region = 'us-east-1' AND data__Identifier = '<CustomerGatewayId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>customer_gateways</code> in a region.
+```sql
+SELECT
+region,
+customer_gateway_id
+FROM awscc.ec2.customer_gateways_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -237,6 +291,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.customer_gateways
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CustomerGatewayId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/customer_gateways_list_only/index.md b/website/docs/services/ec2/customer_gateways_list_only/index.md
deleted file mode 100644
index 0d23bc4b4..000000000
--- a/website/docs/services/ec2/customer_gateways_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: customer_gateways_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - customer_gateways_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>customer_gateways</code> in a region or regions, for all properties use <a href="/services/ec2/customer_gateways/"><code>customer_gateways</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>customer_gateways_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a customer gateway.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.customer_gateways_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "customer_gateway_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>customer_gateways</code> in a region.
-```sql
-SELECT
-region,
-customer_gateway_id
-FROM awscc.ec2.customer_gateways_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>customer_gateways_list_only</code> resource, see <a href="/services/ec2/customer_gateways/#permissions"><code>customer_gateways</code></a>
-
diff --git a/website/docs/services/ec2/dhcp_options/index.md b/website/docs/services/ec2/dhcp_options/index.md
index 77107d6aa..8a7ebe1a8 100644
--- a/website/docs/services/ec2/dhcp_options/index.md
+++ b/website/docs/services/ec2/dhcp_options/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>dhcp_option</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "dhcp_options_id",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>dhcp_option</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "dhcp_options_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcpoption.html"><code>AWS::EC2::DHCPOptions</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>dhcp_options</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>dhcp_options</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>dhcp_options</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>dhcp_options_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>dhcp_options</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dhcp_option</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.ec2.dhcp_options
 WHERE region = 'us-east-1' AND data__Identifier = '<DhcpOptionsId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>dhcp_options</code> in a region.
+```sql
+SELECT
+region,
+dhcp_options_id
+FROM awscc.ec2.dhcp_options_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -250,6 +304,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.dhcp_options
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DhcpOptionsId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/dhcp_options_list_only/index.md b/website/docs/services/ec2/dhcp_options_list_only/index.md
deleted file mode 100644
index 29d984ed8..000000000
--- a/website/docs/services/ec2/dhcp_options_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: dhcp_options_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - dhcp_options_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>dhcp_options</code> in a region or regions, for all properties use <a href="/services/ec2/dhcp_options/"><code>dhcp_options</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>dhcp_options_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::DHCPOptions</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.dhcp_options_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "dhcp_options_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>dhcp_options</code> in a region.
-```sql
-SELECT
-region,
-dhcp_options_id
-FROM awscc.ec2.dhcp_options_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>dhcp_options_list_only</code> resource, see <a href="/services/ec2/dhcp_options/#permissions"><code>dhcp_options</code></a>
-
diff --git a/website/docs/services/ec2/ec2fleets/index.md b/website/docs/services/ec2/ec2fleets/index.md
index 09f6b7e12..c36f668b3 100644
--- a/website/docs/services/ec2/ec2fleets/index.md
+++ b/website/docs/services/ec2/ec2fleets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ec2fleet</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "target_capacity_specification",
@@ -528,6 +537,23 @@ Creates, updates, deletes or gets an <code>ec2fleet</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "fleet_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ec2fleet.html"><code>AWS::EC2::EC2Fleet</code></a>.
 
@@ -537,31 +563,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ec2fleets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TargetCapacitySpecification, LaunchTemplateConfigs, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ec2fleets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ec2fleets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ec2fleets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ec2fleets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -570,6 +602,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ec2fleet</code>.
 ```sql
 SELECT
@@ -590,6 +631,19 @@ context
 FROM awscc.ec2.ec2fleets
 WHERE region = 'us-east-1' AND data__Identifier = '<FleetId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ec2fleets</code> in a region.
+```sql
+SELECT
+region,
+fleet_id
+FROM awscc.ec2.ec2fleets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -810,6 +864,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.ec2fleets
+SET data__PatchDocument = string('{{ {
+    "TargetCapacitySpecification": target_capacity_specification,
+    "ExcessCapacityTerminationPolicy": excess_capacity_termination_policy,
+    "Context": context
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FleetId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/ec2fleets_list_only/index.md b/website/docs/services/ec2/ec2fleets_list_only/index.md
deleted file mode 100644
index fa218996c..000000000
--- a/website/docs/services/ec2/ec2fleets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: ec2fleets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ec2fleets_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ec2fleets</code> in a region or regions, for all properties use <a href="/services/ec2/ec2fleets/"><code>ec2fleets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ec2fleets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::EC2Fleet</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.ec2fleets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "fleet_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ec2fleets</code> in a region.
-```sql
-SELECT
-region,
-fleet_id
-FROM awscc.ec2.ec2fleets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ec2fleets_list_only</code> resource, see <a href="/services/ec2/ec2fleets/#permissions"><code>ec2fleets</code></a>
-
diff --git a/website/docs/services/ec2/egress_only_internet_gateways/index.md b/website/docs/services/ec2/egress_only_internet_gateways/index.md
index fd58bc2f0..01d9759e8 100644
--- a/website/docs/services/ec2/egress_only_internet_gateways/index.md
+++ b/website/docs/services/ec2/egress_only_internet_gateways/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>egress_only_internet_gateway</code> r
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -67,6 +76,23 @@ Creates, updates, deletes or gets an <code>egress_only_internet_gateway</code> r
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Service Generated ID of the EgressOnlyInternetGateway"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-egressonlyinternetgateway.html"><code>AWS::EC2::EgressOnlyInternetGateway</code></a>.
 
@@ -76,31 +102,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>egress_only_internet_gateways</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>egress_only_internet_gateways</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>egress_only_internet_gateways</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>egress_only_internet_gateways_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>egress_only_internet_gateways</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -109,6 +141,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>egress_only_internet_gateway</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ tags
 FROM awscc.ec2.egress_only_internet_gateways
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>egress_only_internet_gateways</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.egress_only_internet_gateways_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -185,6 +239,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.egress_only_internet_gateways
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/egress_only_internet_gateways_list_only/index.md b/website/docs/services/ec2/egress_only_internet_gateways_list_only/index.md
deleted file mode 100644
index 74c871880..000000000
--- a/website/docs/services/ec2/egress_only_internet_gateways_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: egress_only_internet_gateways_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - egress_only_internet_gateways_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>egress_only_internet_gateways</code> in a region or regions, for all properties use <a href="/services/ec2/egress_only_internet_gateways/"><code>egress_only_internet_gateways</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>egress_only_internet_gateways_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::EgressOnlyInternetGateway</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.egress_only_internet_gateways_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Service Generated ID of the EgressOnlyInternetGateway"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>egress_only_internet_gateways</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.egress_only_internet_gateways_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>egress_only_internet_gateways_list_only</code> resource, see <a href="/services/ec2/egress_only_internet_gateways/#permissions"><code>egress_only_internet_gateways</code></a>
-
diff --git a/website/docs/services/ec2/eip_associations/index.md b/website/docs/services/ec2/eip_associations/index.md
index a682666d6..8c27ca47b 100644
--- a/website/docs/services/ec2/eip_associations/index.md
+++ b/website/docs/services/ec2/eip_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>eip_association</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "private_ip_address",
@@ -70,6 +79,23 @@ Creates, updates, deletes or gets an <code>eip_association</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-eipassociation.html"><code>AWS::EC2::EIPAssociation</code></a>.
 
@@ -79,26 +105,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>eip_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>eip_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>eip_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>eip_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +138,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>eip_association</code>.
 ```sql
 SELECT
@@ -120,6 +160,19 @@ e_ip
 FROM awscc.ec2.eip_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>eip_associations</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.eip_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -204,6 +257,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/eip_associations_list_only/index.md b/website/docs/services/ec2/eip_associations_list_only/index.md
deleted file mode 100644
index e058066b0..000000000
--- a/website/docs/services/ec2/eip_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: eip_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - eip_associations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>eip_associations</code> in a region or regions, for all properties use <a href="/services/ec2/eip_associations/"><code>eip_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>eip_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Associates an Elastic IP address with an instance or a network interface. Before you can use an Elastic IP address, you must allocate it to your account. For more information about working with Elastic IP addresses, see &#91;Elastic IP address concepts and rules&#93;(https://docs.aws.amazon.com/vpc/latest/userguide/vpc-eips.html#vpc-eip-overview).<br />You must specify &#96;&#96;AllocationId&#96;&#96; and either &#96;&#96;InstanceId&#96;&#96;, &#96;&#96;NetworkInterfaceId&#96;&#96;, or &#96;&#96;PrivateIpAddress&#96;&#96;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.eip_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>eip_associations</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.eip_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>eip_associations_list_only</code> resource, see <a href="/services/ec2/eip_associations/#permissions"><code>eip_associations</code></a>
-
diff --git a/website/docs/services/ec2/eips/index.md b/website/docs/services/ec2/eips/index.md
index d11d7f05c..fc16e1672 100644
--- a/website/docs/services/ec2/eips/index.md
+++ b/website/docs/services/ec2/eips/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>eip</code> resource or lists <code>ei
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "public_ip",
@@ -102,6 +111,28 @@ Creates, updates, deletes or gets an <code>eip</code> resource or lists <code>ei
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "public_ip",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "allocation_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-eip.html"><code>AWS::EC2::EIP</code></a>.
 
@@ -111,31 +142,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>eips</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>eips</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>eips</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>eips_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>eips</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +181,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>eip</code>.
 ```sql
 SELECT
@@ -161,6 +207,20 @@ tags
 FROM awscc.ec2.eips
 WHERE region = 'us-east-1' AND data__Identifier = '<PublicIp>|<AllocationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>eips</code> in a region.
+```sql
+SELECT
+region,
+public_ip,
+allocation_id
+FROM awscc.ec2.eips_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -265,6 +325,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.eips
+SET data__PatchDocument = string('{{ {
+    "Domain": domain,
+    "InstanceId": instance_id,
+    "PublicIpv4Pool": public_ipv4_pool,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PublicIp>|<AllocationId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/eips_list_only/index.md b/website/docs/services/ec2/eips_list_only/index.md
deleted file mode 100644
index 1d678661b..000000000
--- a/website/docs/services/ec2/eips_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: eips_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - eips_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>eips</code> in a region or regions, for all properties use <a href="/services/ec2/eips/"><code>eips</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>eips_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies an Elastic IP (EIP) address and can, optionally, associate it with an Amazon EC2 instance.<br />You can allocate an Elastic IP address from an address pool owned by AWS or from an address pool created from a public IPv4 address range that you have brought to AWS for use with your AWS resources using bring your own IP addresses (BYOIP). For more information, see &#91;Bring Your Own IP Addresses (BYOIP)&#93;(https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-byoip.html) in the &#42;Amazon EC2 User Guide&#42;.<br />For more information, see &#91;Elastic IP Addresses&#93;(https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html) in the &#42;Amazon EC2 User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.eips_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "public_ip",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "allocation_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>eips</code> in a region.
-```sql
-SELECT
-region,
-public_ip,
-allocation_id
-FROM awscc.ec2.eips_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>eips_list_only</code> resource, see <a href="/services/ec2/eips/#permissions"><code>eips</code></a>
-
diff --git a/website/docs/services/ec2/enclave_certificate_iam_role_associations/index.md b/website/docs/services/ec2/enclave_certificate_iam_role_associations/index.md
index 9d6ecb856..d3534947e 100644
--- a/website/docs/services/ec2/enclave_certificate_iam_role_associations/index.md
+++ b/website/docs/services/ec2/enclave_certificate_iam_role_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>enclave_certificate_iam_role_associat
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "certificate_arn",
@@ -65,6 +74,28 @@ Creates, updates, deletes or gets an <code>enclave_certificate_iam_role_associat
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "certificate_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the ACM certificate with which to associate the IAM role."
+  },
+  {
+    "name": "role_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the IAM role to associate with the ACM certificate. You can associate up to 16 IAM roles with an ACM certificate."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-enclavecertificateiamroleassociation.html"><code>AWS::EC2::EnclaveCertificateIamRoleAssociation</code></a>.
 
@@ -74,26 +105,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>enclave_certificate_iam_role_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CertificateArn, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>enclave_certificate_iam_role_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>enclave_certificate_iam_role_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>enclave_certificate_iam_role_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +138,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>enclave_certificate_iam_role_association</code>.
 ```sql
 SELECT
@@ -114,6 +159,20 @@ encryption_kms_key_id
 FROM awscc.ec2.enclave_certificate_iam_role_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<CertificateArn>|<RoleArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>enclave_certificate_iam_role_associations</code> in a region.
+```sql
+SELECT
+region,
+certificate_arn,
+role_arn
+FROM awscc.ec2.enclave_certificate_iam_role_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -180,6 +239,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/enclave_certificate_iam_role_associations_list_only/index.md b/website/docs/services/ec2/enclave_certificate_iam_role_associations_list_only/index.md
deleted file mode 100644
index 12082c46b..000000000
--- a/website/docs/services/ec2/enclave_certificate_iam_role_associations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: enclave_certificate_iam_role_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - enclave_certificate_iam_role_associations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>enclave_certificate_iam_role_associations</code> in a region or regions, for all properties use <a href="/services/ec2/enclave_certificate_iam_role_associations/"><code>enclave_certificate_iam_role_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>enclave_certificate_iam_role_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Associates an AWS Identity and Access Management (IAM) role with an AWS Certificate Manager (ACM) certificate. This association is based on Amazon Resource Names and it enables the certificate to be used by the ACM for Nitro Enclaves application inside an enclave.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.enclave_certificate_iam_role_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "certificate_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the ACM certificate with which to associate the IAM role."
-  },
-  {
-    "name": "role_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the IAM role to associate with the ACM certificate. You can associate up to 16 IAM roles with an ACM certificate."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>enclave_certificate_iam_role_associations</code> in a region.
-```sql
-SELECT
-region,
-certificate_arn,
-role_arn
-FROM awscc.ec2.enclave_certificate_iam_role_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>enclave_certificate_iam_role_associations_list_only</code> resource, see <a href="/services/ec2/enclave_certificate_iam_role_associations/#permissions"><code>enclave_certificate_iam_role_associations</code></a>
-
diff --git a/website/docs/services/ec2/flow_logs/index.md b/website/docs/services/ec2/flow_logs/index.md
index b140de786..0fcaebd70 100644
--- a/website/docs/services/ec2/flow_logs/index.md
+++ b/website/docs/services/ec2/flow_logs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>flow_log</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -134,6 +143,23 @@ Creates, updates, deletes or gets a <code>flow_log</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The Flow Log ID"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html"><code>AWS::EC2::FlowLog</code></a>.
 
@@ -143,31 +169,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>flow_logs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResourceType, ResourceId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>flow_logs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>flow_logs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>flow_logs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>flow_logs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -176,6 +208,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>flow_log</code>.
 ```sql
 SELECT
@@ -196,6 +237,19 @@ destination_options
 FROM awscc.ec2.flow_logs
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>flow_logs</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.flow_logs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -307,6 +361,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.flow_logs
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/flow_logs_list_only/index.md b/website/docs/services/ec2/flow_logs_list_only/index.md
deleted file mode 100644
index 87ad34329..000000000
--- a/website/docs/services/ec2/flow_logs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: flow_logs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - flow_logs_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>flow_logs</code> in a region or regions, for all properties use <a href="/services/ec2/flow_logs/"><code>flow_logs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>flow_logs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a VPC flow log, which enables you to capture IP traffic for a specific network interface, subnet, or VPC.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.flow_logs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The Flow Log ID"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>flow_logs</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.flow_logs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>flow_logs_list_only</code> resource, see <a href="/services/ec2/flow_logs/#permissions"><code>flow_logs</code></a>
-
diff --git a/website/docs/services/ec2/gateway_route_table_associations/index.md b/website/docs/services/ec2/gateway_route_table_associations/index.md
index 9a1b19537..35944af00 100644
--- a/website/docs/services/ec2/gateway_route_table_associations/index.md
+++ b/website/docs/services/ec2/gateway_route_table_associations/index.md
@@ -168,6 +168,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.gateway_route_table_associations
+SET data__PatchDocument = string('{{ {
+    "RouteTableId": route_table_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<GatewayId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/hosts/index.md b/website/docs/services/ec2/hosts/index.md
index d78c62563..c0b2be4a3 100644
--- a/website/docs/services/ec2/hosts/index.md
+++ b/website/docs/services/ec2/hosts/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>host</code> resource or lists <code>ho
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "host_id",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets a <code>host</code> resource or lists <code>ho
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "host_id",
+    "type": "string",
+    "description": "ID of the host created."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-host.html"><code>AWS::EC2::Host</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>hosts</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AvailabilityZone, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>hosts</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>hosts</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>hosts_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>hosts</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>host</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ tags
 FROM awscc.ec2.hosts
 WHERE region = 'us-east-1' AND data__Identifier = '<HostId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>hosts</code> in a region.
+```sql
+SELECT
+region,
+host_id
+FROM awscc.ec2.hosts_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -255,6 +309,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.hosts
+SET data__PatchDocument = string('{{ {
+    "AutoPlacement": auto_placement,
+    "HostRecovery": host_recovery,
+    "HostMaintenance": host_maintenance,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<HostId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/hosts_list_only/index.md b/website/docs/services/ec2/hosts_list_only/index.md
deleted file mode 100644
index 24c1eebc5..000000000
--- a/website/docs/services/ec2/hosts_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: hosts_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - hosts_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>hosts</code> in a region or regions, for all properties use <a href="/services/ec2/hosts/"><code>hosts</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>hosts_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::Host</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.hosts_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "host_id",
-    "type": "string",
-    "description": "ID of the host created."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>hosts</code> in a region.
-```sql
-SELECT
-region,
-host_id
-FROM awscc.ec2.hosts_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>hosts_list_only</code> resource, see <a href="/services/ec2/hosts/#permissions"><code>hosts</code></a>
-
diff --git a/website/docs/services/ec2/index.md b/website/docs/services/ec2/index.md
index cda81c0d5..e61b11840 100644
--- a/website/docs/services/ec2/index.md
+++ b/website/docs/services/ec2/index.md
@@ -20,7 +20,7 @@ The ec2 service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>190</b></span><br />
+<span>total resources:&nbsp;<b>96</b></span><br />
 </div>
 </div>
 
@@ -30,196 +30,102 @@ The ec2 service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/ec2/capacity_reservation_fleets/">capacity_reservation_fleets</a><br />
-<a href="/services/ec2/capacity_reservation_fleets_list_only/">capacity_reservation_fleets_list_only</a><br />
 <a href="/services/ec2/capacity_reservations/">capacity_reservations</a><br />
-<a href="/services/ec2/capacity_reservations_list_only/">capacity_reservations_list_only</a><br />
 <a href="/services/ec2/carrier_gateways/">carrier_gateways</a><br />
-<a href="/services/ec2/carrier_gateways_list_only/">carrier_gateways_list_only</a><br />
 <a href="/services/ec2/customer_gateways/">customer_gateways</a><br />
-<a href="/services/ec2/customer_gateways_list_only/">customer_gateways_list_only</a><br />
 <a href="/services/ec2/dhcp_options/">dhcp_options</a><br />
-<a href="/services/ec2/dhcp_options_list_only/">dhcp_options_list_only</a><br />
 <a href="/services/ec2/ec2fleets/">ec2fleets</a><br />
-<a href="/services/ec2/ec2fleets_list_only/">ec2fleets_list_only</a><br />
 <a href="/services/ec2/egress_only_internet_gateways/">egress_only_internet_gateways</a><br />
-<a href="/services/ec2/egress_only_internet_gateways_list_only/">egress_only_internet_gateways_list_only</a><br />
 <a href="/services/ec2/eip_associations/">eip_associations</a><br />
-<a href="/services/ec2/eip_associations_list_only/">eip_associations_list_only</a><br />
 <a href="/services/ec2/eips/">eips</a><br />
-<a href="/services/ec2/eips_list_only/">eips_list_only</a><br />
 <a href="/services/ec2/enclave_certificate_iam_role_associations/">enclave_certificate_iam_role_associations</a><br />
-<a href="/services/ec2/enclave_certificate_iam_role_associations_list_only/">enclave_certificate_iam_role_associations_list_only</a><br />
 <a href="/services/ec2/flow_logs/">flow_logs</a><br />
-<a href="/services/ec2/flow_logs_list_only/">flow_logs_list_only</a><br />
 <a href="/services/ec2/gateway_route_table_associations/">gateway_route_table_associations</a><br />
 <a href="/services/ec2/hosts/">hosts</a><br />
-<a href="/services/ec2/hosts_list_only/">hosts_list_only</a><br />
 <a href="/services/ec2/instance_connect_endpoints/">instance_connect_endpoints</a><br />
-<a href="/services/ec2/instance_connect_endpoints_list_only/">instance_connect_endpoints_list_only</a><br />
 <a href="/services/ec2/instances/">instances</a><br />
-<a href="/services/ec2/instances_list_only/">instances_list_only</a><br />
 <a href="/services/ec2/internet_gateways/">internet_gateways</a><br />
-<a href="/services/ec2/internet_gateways_list_only/">internet_gateways_list_only</a><br />
 <a href="/services/ec2/ip_pool_route_table_associations/">ip_pool_route_table_associations</a><br />
-<a href="/services/ec2/ip_pool_route_table_associations_list_only/">ip_pool_route_table_associations_list_only</a><br />
 <a href="/services/ec2/ipam_allocations/">ipam_allocations</a><br />
-<a href="/services/ec2/ipam_allocations_list_only/">ipam_allocations_list_only</a><br />
 <a href="/services/ec2/ipam_pool_cidrs/">ipam_pool_cidrs</a><br />
-<a href="/services/ec2/ipam_pool_cidrs_list_only/">ipam_pool_cidrs_list_only</a><br />
 <a href="/services/ec2/ipam_pools/">ipam_pools</a><br />
-<a href="/services/ec2/ipam_pools_list_only/">ipam_pools_list_only</a><br />
 <a href="/services/ec2/ipam_resource_discoveries/">ipam_resource_discoveries</a><br />
-<a href="/services/ec2/ipam_resource_discoveries_list_only/">ipam_resource_discoveries_list_only</a><br />
 <a href="/services/ec2/ipam_resource_discovery_associations/">ipam_resource_discovery_associations</a><br />
-<a href="/services/ec2/ipam_resource_discovery_associations_list_only/">ipam_resource_discovery_associations_list_only</a><br />
 <a href="/services/ec2/ipam_scopes/">ipam_scopes</a><br />
-<a href="/services/ec2/ipam_scopes_list_only/">ipam_scopes_list_only</a><br />
 <a href="/services/ec2/ipams/">ipams</a><br />
-<a href="/services/ec2/ipams_list_only/">ipams_list_only</a><br />
 <a href="/services/ec2/key_pairs/">key_pairs</a><br />
-<a href="/services/ec2/key_pairs_list_only/">key_pairs_list_only</a><br />
 <a href="/services/ec2/launch_templates/">launch_templates</a><br />
-<a href="/services/ec2/launch_templates_list_only/">launch_templates_list_only</a><br />
 <a href="/services/ec2/local_gateway_route_table_virtual_interface_group_associations/">local_gateway_route_table_virtual_interface_group_associations</a><br />
-<a href="/services/ec2/local_gateway_route_table_virtual_interface_group_associations_list_only/">local_gateway_route_table_virtual_interface_group_associations_list_only</a><br />
 <a href="/services/ec2/local_gateway_route_tables/">local_gateway_route_tables</a><br />
-<a href="/services/ec2/local_gateway_route_tables_list_only/">local_gateway_route_tables_list_only</a><br />
 <a href="/services/ec2/local_gateway_route_tablevpc_associations/">local_gateway_route_tablevpc_associations</a><br />
-<a href="/services/ec2/local_gateway_route_tablevpc_associations_list_only/">local_gateway_route_tablevpc_associations_list_only</a><br />
 <a href="/services/ec2/local_gateway_routes/">local_gateway_routes</a><br />
-<a href="/services/ec2/local_gateway_routes_list_only/">local_gateway_routes_list_only</a><br />
 <a href="/services/ec2/nat_gateways/">nat_gateways</a><br />
-<a href="/services/ec2/nat_gateways_list_only/">nat_gateways_list_only</a><br />
 <a href="/services/ec2/network_acls/">network_acls</a><br />
-<a href="/services/ec2/network_acls_list_only/">network_acls_list_only</a><br />
 <a href="/services/ec2/network_insights_access_scope_analyses/">network_insights_access_scope_analyses</a><br />
-<a href="/services/ec2/network_insights_access_scope_analyses_list_only/">network_insights_access_scope_analyses_list_only</a><br />
 <a href="/services/ec2/network_insights_access_scopes/">network_insights_access_scopes</a><br />
-<a href="/services/ec2/network_insights_access_scopes_list_only/">network_insights_access_scopes_list_only</a><br />
 <a href="/services/ec2/network_insights_analyses/">network_insights_analyses</a><br />
-<a href="/services/ec2/network_insights_analyses_list_only/">network_insights_analyses_list_only</a><br />
 <a href="/services/ec2/network_insights_paths/">network_insights_paths</a><br />
-<a href="/services/ec2/network_insights_paths_list_only/">network_insights_paths_list_only</a><br />
 <a href="/services/ec2/network_interface_attachments/">network_interface_attachments</a><br />
-<a href="/services/ec2/network_interface_attachments_list_only/">network_interface_attachments_list_only</a><br />
 <a href="/services/ec2/network_interfaces/">network_interfaces</a><br />
-<a href="/services/ec2/network_interfaces_list_only/">network_interfaces_list_only</a><br />
 <a href="/services/ec2/network_performance_metric_subscriptions/">network_performance_metric_subscriptions</a><br />
-<a href="/services/ec2/network_performance_metric_subscriptions_list_only/">network_performance_metric_subscriptions_list_only</a><br />
 <a href="/services/ec2/placement_groups/">placement_groups</a><br />
-<a href="/services/ec2/placement_groups_list_only/">placement_groups_list_only</a><br />
 <a href="/services/ec2/prefix_lists/">prefix_lists</a><br />
-<a href="/services/ec2/prefix_lists_list_only/">prefix_lists_list_only</a><br />
 <a href="/services/ec2/route_server_associations/">route_server_associations</a><br />
-<a href="/services/ec2/route_server_associations_list_only/">route_server_associations_list_only</a><br />
 <a href="/services/ec2/route_server_endpoints/">route_server_endpoints</a><br />
-<a href="/services/ec2/route_server_endpoints_list_only/">route_server_endpoints_list_only</a><br />
 <a href="/services/ec2/route_server_peers/">route_server_peers</a><br />
-<a href="/services/ec2/route_server_peers_list_only/">route_server_peers_list_only</a><br />
 <a href="/services/ec2/route_server_propagations/">route_server_propagations</a><br />
-<a href="/services/ec2/route_server_propagations_list_only/">route_server_propagations_list_only</a><br />
 <a href="/services/ec2/route_servers/">route_servers</a><br />
-<a href="/services/ec2/route_servers_list_only/">route_servers_list_only</a><br />
 <a href="/services/ec2/route_tables/">route_tables</a><br />
-<a href="/services/ec2/route_tables_list_only/">route_tables_list_only</a><br />
-<a href="/services/ec2/routes/">routes</a><br />
-<a href="/services/ec2/routes_list_only/">routes_list_only</a>
+<a href="/services/ec2/routes/">routes</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/ec2/security_group_egresses/">security_group_egresses</a><br />
-<a href="/services/ec2/security_group_egresses_list_only/">security_group_egresses_list_only</a><br />
 <a href="/services/ec2/security_group_ingresses/">security_group_ingresses</a><br />
-<a href="/services/ec2/security_group_ingresses_list_only/">security_group_ingresses_list_only</a><br />
 <a href="/services/ec2/security_group_vpc_associations/">security_group_vpc_associations</a><br />
-<a href="/services/ec2/security_group_vpc_associations_list_only/">security_group_vpc_associations_list_only</a><br />
 <a href="/services/ec2/security_groups/">security_groups</a><br />
-<a href="/services/ec2/security_groups_list_only/">security_groups_list_only</a><br />
 <a href="/services/ec2/snapshot_block_public_accesses/">snapshot_block_public_accesses</a><br />
-<a href="/services/ec2/snapshot_block_public_accesses_list_only/">snapshot_block_public_accesses_list_only</a><br />
 <a href="/services/ec2/spot_fleets/">spot_fleets</a><br />
-<a href="/services/ec2/spot_fleets_list_only/">spot_fleets_list_only</a><br />
 <a href="/services/ec2/subnet_cidr_blocks/">subnet_cidr_blocks</a><br />
-<a href="/services/ec2/subnet_cidr_blocks_list_only/">subnet_cidr_blocks_list_only</a><br />
 <a href="/services/ec2/subnet_network_acl_associations/">subnet_network_acl_associations</a><br />
-<a href="/services/ec2/subnet_network_acl_associations_list_only/">subnet_network_acl_associations_list_only</a><br />
 <a href="/services/ec2/subnet_route_table_associations/">subnet_route_table_associations</a><br />
-<a href="/services/ec2/subnet_route_table_associations_list_only/">subnet_route_table_associations_list_only</a><br />
 <a href="/services/ec2/subnets/">subnets</a><br />
-<a href="/services/ec2/subnets_list_only/">subnets_list_only</a><br />
 <a href="/services/ec2/traffic_mirror_filter_rules/">traffic_mirror_filter_rules</a><br />
-<a href="/services/ec2/traffic_mirror_filter_rules_list_only/">traffic_mirror_filter_rules_list_only</a><br />
 <a href="/services/ec2/traffic_mirror_filters/">traffic_mirror_filters</a><br />
-<a href="/services/ec2/traffic_mirror_filters_list_only/">traffic_mirror_filters_list_only</a><br />
 <a href="/services/ec2/traffic_mirror_sessions/">traffic_mirror_sessions</a><br />
-<a href="/services/ec2/traffic_mirror_sessions_list_only/">traffic_mirror_sessions_list_only</a><br />
 <a href="/services/ec2/traffic_mirror_targets/">traffic_mirror_targets</a><br />
-<a href="/services/ec2/traffic_mirror_targets_list_only/">traffic_mirror_targets_list_only</a><br />
 <a href="/services/ec2/transit_gateway_attachments/">transit_gateway_attachments</a><br />
-<a href="/services/ec2/transit_gateway_attachments_list_only/">transit_gateway_attachments_list_only</a><br />
 <a href="/services/ec2/transit_gateway_connect_peers/">transit_gateway_connect_peers</a><br />
-<a href="/services/ec2/transit_gateway_connect_peers_list_only/">transit_gateway_connect_peers_list_only</a><br />
 <a href="/services/ec2/transit_gateway_connects/">transit_gateway_connects</a><br />
-<a href="/services/ec2/transit_gateway_connects_list_only/">transit_gateway_connects_list_only</a><br />
 <a href="/services/ec2/transit_gateway_multicast_domain_associations/">transit_gateway_multicast_domain_associations</a><br />
-<a href="/services/ec2/transit_gateway_multicast_domain_associations_list_only/">transit_gateway_multicast_domain_associations_list_only</a><br />
 <a href="/services/ec2/transit_gateway_multicast_domains/">transit_gateway_multicast_domains</a><br />
-<a href="/services/ec2/transit_gateway_multicast_domains_list_only/">transit_gateway_multicast_domains_list_only</a><br />
 <a href="/services/ec2/transit_gateway_multicast_group_members/">transit_gateway_multicast_group_members</a><br />
-<a href="/services/ec2/transit_gateway_multicast_group_members_list_only/">transit_gateway_multicast_group_members_list_only</a><br />
 <a href="/services/ec2/transit_gateway_multicast_group_sources/">transit_gateway_multicast_group_sources</a><br />
-<a href="/services/ec2/transit_gateway_multicast_group_sources_list_only/">transit_gateway_multicast_group_sources_list_only</a><br />
 <a href="/services/ec2/transit_gateway_peering_attachments/">transit_gateway_peering_attachments</a><br />
-<a href="/services/ec2/transit_gateway_peering_attachments_list_only/">transit_gateway_peering_attachments_list_only</a><br />
 <a href="/services/ec2/transit_gateway_route_table_associations/">transit_gateway_route_table_associations</a><br />
-<a href="/services/ec2/transit_gateway_route_table_associations_list_only/">transit_gateway_route_table_associations_list_only</a><br />
 <a href="/services/ec2/transit_gateway_route_table_propagations/">transit_gateway_route_table_propagations</a><br />
-<a href="/services/ec2/transit_gateway_route_table_propagations_list_only/">transit_gateway_route_table_propagations_list_only</a><br />
 <a href="/services/ec2/transit_gateway_route_tables/">transit_gateway_route_tables</a><br />
-<a href="/services/ec2/transit_gateway_route_tables_list_only/">transit_gateway_route_tables_list_only</a><br />
 <a href="/services/ec2/transit_gateway_routes/">transit_gateway_routes</a><br />
-<a href="/services/ec2/transit_gateway_routes_list_only/">transit_gateway_routes_list_only</a><br />
 <a href="/services/ec2/transit_gateway_vpc_attachments/">transit_gateway_vpc_attachments</a><br />
-<a href="/services/ec2/transit_gateway_vpc_attachments_list_only/">transit_gateway_vpc_attachments_list_only</a><br />
 <a href="/services/ec2/transit_gateways/">transit_gateways</a><br />
-<a href="/services/ec2/transit_gateways_list_only/">transit_gateways_list_only</a><br />
 <a href="/services/ec2/verified_access_endpoints/">verified_access_endpoints</a><br />
-<a href="/services/ec2/verified_access_endpoints_list_only/">verified_access_endpoints_list_only</a><br />
 <a href="/services/ec2/verified_access_groups/">verified_access_groups</a><br />
-<a href="/services/ec2/verified_access_groups_list_only/">verified_access_groups_list_only</a><br />
 <a href="/services/ec2/verified_access_instances/">verified_access_instances</a><br />
-<a href="/services/ec2/verified_access_instances_list_only/">verified_access_instances_list_only</a><br />
 <a href="/services/ec2/verified_access_trust_providers/">verified_access_trust_providers</a><br />
-<a href="/services/ec2/verified_access_trust_providers_list_only/">verified_access_trust_providers_list_only</a><br />
 <a href="/services/ec2/volume_attachments/">volume_attachments</a><br />
-<a href="/services/ec2/volume_attachments_list_only/">volume_attachments_list_only</a><br />
 <a href="/services/ec2/volumes/">volumes</a><br />
-<a href="/services/ec2/volumes_list_only/">volumes_list_only</a><br />
 <a href="/services/ec2/vpc_block_public_access_exclusions/">vpc_block_public_access_exclusions</a><br />
-<a href="/services/ec2/vpc_block_public_access_exclusions_list_only/">vpc_block_public_access_exclusions_list_only</a><br />
 <a href="/services/ec2/vpc_block_public_access_options/">vpc_block_public_access_options</a><br />
 <a href="/services/ec2/vpc_cidr_blocks/">vpc_cidr_blocks</a><br />
-<a href="/services/ec2/vpc_cidr_blocks_list_only/">vpc_cidr_blocks_list_only</a><br />
 <a href="/services/ec2/vpc_endpoint_connection_notifications/">vpc_endpoint_connection_notifications</a><br />
-<a href="/services/ec2/vpc_endpoint_connection_notifications_list_only/">vpc_endpoint_connection_notifications_list_only</a><br />
 <a href="/services/ec2/vpc_endpoint_service_permissions/">vpc_endpoint_service_permissions</a><br />
-<a href="/services/ec2/vpc_endpoint_service_permissions_list_only/">vpc_endpoint_service_permissions_list_only</a><br />
 <a href="/services/ec2/vpc_endpoint_services/">vpc_endpoint_services</a><br />
-<a href="/services/ec2/vpc_endpoint_services_list_only/">vpc_endpoint_services_list_only</a><br />
 <a href="/services/ec2/vpc_endpoints/">vpc_endpoints</a><br />
-<a href="/services/ec2/vpc_endpoints_list_only/">vpc_endpoints_list_only</a><br />
 <a href="/services/ec2/vpc_gateway_attachments/">vpc_gateway_attachments</a><br />
-<a href="/services/ec2/vpc_gateway_attachments_list_only/">vpc_gateway_attachments_list_only</a><br />
 <a href="/services/ec2/vpc_peering_connections/">vpc_peering_connections</a><br />
-<a href="/services/ec2/vpc_peering_connections_list_only/">vpc_peering_connections_list_only</a><br />
 <a href="/services/ec2/vpcdhcp_options_associations/">vpcdhcp_options_associations</a><br />
-<a href="/services/ec2/vpcdhcp_options_associations_list_only/">vpcdhcp_options_associations_list_only</a><br />
 <a href="/services/ec2/vpcs/">vpcs</a><br />
-<a href="/services/ec2/vpcs_list_only/">vpcs_list_only</a><br />
 <a href="/services/ec2/vpn_connection_routes/">vpn_connection_routes</a><br />
-<a href="/services/ec2/vpn_connection_routes_list_only/">vpn_connection_routes_list_only</a><br />
 <a href="/services/ec2/vpn_connections/">vpn_connections</a><br />
-<a href="/services/ec2/vpn_connections_list_only/">vpn_connections_list_only</a><br />
-<a href="/services/ec2/vpn_gateways/">vpn_gateways</a><br />
-<a href="/services/ec2/vpn_gateways_list_only/">vpn_gateways_list_only</a>
+<a href="/services/ec2/vpn_gateways/">vpn_gateways</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/ec2/instance_connect_endpoints/index.md b/website/docs/services/ec2/instance_connect_endpoints/index.md
index 023edefaa..6c6080a19 100644
--- a/website/docs/services/ec2/instance_connect_endpoints/index.md
+++ b/website/docs/services/ec2/instance_connect_endpoints/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>instance_connect_endpoint</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets an <code>instance_connect_endpoint</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The id of the instance connect endpoint"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-instanceconnectendpoint.html"><code>AWS::EC2::InstanceConnectEndpoint</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>instance_connect_endpoints</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SubnetId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>instance_connect_endpoints</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>instance_connect_endpoints</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>instance_connect_endpoints_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>instance_connect_endpoints</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>instance_connect_endpoint</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ security_group_ids
 FROM awscc.ec2.instance_connect_endpoints
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>instance_connect_endpoints</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.instance_connect_endpoints_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -216,6 +270,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.instance_connect_endpoints
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/instance_connect_endpoints_list_only/index.md b/website/docs/services/ec2/instance_connect_endpoints_list_only/index.md
deleted file mode 100644
index bcb4e5f27..000000000
--- a/website/docs/services/ec2/instance_connect_endpoints_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: instance_connect_endpoints_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - instance_connect_endpoints_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>instance_connect_endpoints</code> in a region or regions, for all properties use <a href="/services/ec2/instance_connect_endpoints/"><code>instance_connect_endpoints</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>instance_connect_endpoints_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::InstanceConnectEndpoint</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.instance_connect_endpoints_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The id of the instance connect endpoint"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>instance_connect_endpoints</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.instance_connect_endpoints_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>instance_connect_endpoints_list_only</code> resource, see <a href="/services/ec2/instance_connect_endpoints/#permissions"><code>instance_connect_endpoints</code></a>
-
diff --git a/website/docs/services/ec2/instances/index.md b/website/docs/services/ec2/instances/index.md
index 3075897a8..ab16614a3 100644
--- a/website/docs/services/ec2/instances/index.md
+++ b/website/docs/services/ec2/instances/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "private_dns_name",
@@ -748,6 +757,23 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "instance_id",
+    "type": "string",
+    "description": "The EC2 Instance ID."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-instance.html"><code>AWS::EC2::Instance</code></a>.
 
@@ -757,31 +783,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>instances_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -790,6 +822,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>instance</code>.
 ```sql
 SELECT
@@ -845,6 +886,19 @@ credit_specification
 FROM awscc.ec2.instances
 WHERE region = 'us-east-1' AND data__Identifier = '<InstanceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>instances</code> in a region.
+```sql
+SELECT
+region,
+instance_id
+FROM awscc.ec2.instances_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1226,6 +1280,41 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.instances
+SET data__PatchDocument = string('{{ {
+    "Volumes": volumes,
+    "Tags": tags,
+    "AdditionalInfo": additional_info,
+    "MetadataOptions": metadata_options,
+    "PrivateDnsNameOptions": private_dns_name_options,
+    "HostId": host_id,
+    "SecurityGroupIds": security_group_ids,
+    "SsmAssociations": ssm_associations,
+    "Affinity": affinity,
+    "Tenancy": tenancy,
+    "UserData": user_data,
+    "BlockDeviceMappings": block_device_mappings,
+    "IamInstanceProfile": iam_instance_profile,
+    "KernelId": kernel_id,
+    "EbsOptimized": ebs_optimized,
+    "PropagateTagsToVolumeOnCreation": propagate_tags_to_volume_on_creation,
+    "InstanceType": instance_type,
+    "Monitoring": monitoring,
+    "InstanceInitiatedShutdownBehavior": instance_initiated_shutdown_behavior,
+    "DisableApiTermination": disable_api_termination,
+    "RamdiskId": ramdisk_id,
+    "SourceDestCheck": source_dest_check,
+    "CreditSpecification": credit_specification
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InstanceId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/instances_list_only/index.md b/website/docs/services/ec2/instances_list_only/index.md
deleted file mode 100644
index 1015ceebc..000000000
--- a/website/docs/services/ec2/instances_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: instances_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - instances_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>instances</code> in a region or regions, for all properties use <a href="/services/ec2/instances/"><code>instances</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>instances_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::Instance</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.instances_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "instance_id",
-    "type": "string",
-    "description": "The EC2 Instance ID."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>instances</code> in a region.
-```sql
-SELECT
-region,
-instance_id
-FROM awscc.ec2.instances_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>instances_list_only</code> resource, see <a href="/services/ec2/instances/#permissions"><code>instances</code></a>
-
diff --git a/website/docs/services/ec2/internet_gateways/index.md b/website/docs/services/ec2/internet_gateways/index.md
index 08bb31752..867254bb0 100644
--- a/website/docs/services/ec2/internet_gateways/index.md
+++ b/website/docs/services/ec2/internet_gateways/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>internet_gateway</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "internet_gateway_id",
@@ -62,6 +71,23 @@ Creates, updates, deletes or gets an <code>internet_gateway</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "internet_gateway_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-internetgateway.html"><code>AWS::EC2::InternetGateway</code></a>.
 
@@ -71,31 +97,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>internet_gateways</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>internet_gateways</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>internet_gateways</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>internet_gateways_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>internet_gateways</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -104,6 +136,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>internet_gateway</code>.
 ```sql
 SELECT
@@ -113,6 +154,19 @@ tags
 FROM awscc.ec2.internet_gateways
 WHERE region = 'us-east-1' AND data__Identifier = '<InternetGatewayId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>internet_gateways</code> in a region.
+```sql
+SELECT
+region,
+internet_gateway_id
+FROM awscc.ec2.internet_gateways_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -175,6 +229,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.internet_gateways
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InternetGatewayId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/internet_gateways_list_only/index.md b/website/docs/services/ec2/internet_gateways_list_only/index.md
deleted file mode 100644
index ad9ae574d..000000000
--- a/website/docs/services/ec2/internet_gateways_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: internet_gateways_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - internet_gateways_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>internet_gateways</code> in a region or regions, for all properties use <a href="/services/ec2/internet_gateways/"><code>internet_gateways</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>internet_gateways_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Allocates an internet gateway for use with a VPC. After creating the Internet gateway, you then attach it to a VPC.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.internet_gateways_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "internet_gateway_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>internet_gateways</code> in a region.
-```sql
-SELECT
-region,
-internet_gateway_id
-FROM awscc.ec2.internet_gateways_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>internet_gateways_list_only</code> resource, see <a href="/services/ec2/internet_gateways/#permissions"><code>internet_gateways</code></a>
-
diff --git a/website/docs/services/ec2/ip_pool_route_table_associations/index.md b/website/docs/services/ec2/ip_pool_route_table_associations/index.md
index 0c8e4b7cf..304de9309 100644
--- a/website/docs/services/ec2/ip_pool_route_table_associations/index.md
+++ b/website/docs/services/ec2/ip_pool_route_table_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ip_pool_route_table_association</code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "association_id",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets an <code>ip_pool_route_table_association</code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "association_id",
+    "type": "string",
+    "description": "The route table association ID."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ippoolroutetableassociation.html"><code>AWS::EC2::IpPoolRouteTableAssociation</code></a>.
 
@@ -64,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ip_pool_route_table_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PublicIpv4Pool, RouteTableId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ip_pool_route_table_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ip_pool_route_table_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ip_pool_route_table_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ip_pool_route_table_association</code>.
 ```sql
 SELECT
@@ -102,6 +142,19 @@ route_table_id
 FROM awscc.ec2.ip_pool_route_table_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<AssociationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ip_pool_route_table_associations</code> in a region.
+```sql
+SELECT
+region,
+association_id
+FROM awscc.ec2.ip_pool_route_table_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -168,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/ip_pool_route_table_associations_list_only/index.md b/website/docs/services/ec2/ip_pool_route_table_associations_list_only/index.md
deleted file mode 100644
index 24143dbaf..000000000
--- a/website/docs/services/ec2/ip_pool_route_table_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: ip_pool_route_table_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ip_pool_route_table_associations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ip_pool_route_table_associations</code> in a region or regions, for all properties use <a href="/services/ec2/ip_pool_route_table_associations/"><code>ip_pool_route_table_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ip_pool_route_table_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::IpPoolRouteTableAssociation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.ip_pool_route_table_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "association_id",
-    "type": "string",
-    "description": "The route table association ID."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ip_pool_route_table_associations</code> in a region.
-```sql
-SELECT
-region,
-association_id
-FROM awscc.ec2.ip_pool_route_table_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ip_pool_route_table_associations_list_only</code> resource, see <a href="/services/ec2/ip_pool_route_table_associations/#permissions"><code>ip_pool_route_table_associations</code></a>
-
diff --git a/website/docs/services/ec2/ipam_allocations/index.md b/website/docs/services/ec2/ipam_allocations/index.md
index f83b4158b..c15a3b912 100644
--- a/website/docs/services/ec2/ipam_allocations/index.md
+++ b/website/docs/services/ec2/ipam_allocations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ipam_allocation</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ipam_pool_allocation_id",
@@ -65,6 +74,33 @@ Creates, updates, deletes or gets an <code>ipam_allocation</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "ipam_pool_allocation_id",
+    "type": "string",
+    "description": "Id of the allocation."
+  },
+  {
+    "name": "ipam_pool_id",
+    "type": "string",
+    "description": "Id of the IPAM Pool."
+  },
+  {
+    "name": "cidr",
+    "type": "string",
+    "description": "Represents a single IPv4 or IPv6 CIDR"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamallocation.html"><code>AWS::EC2::IPAMAllocation</code></a>.
 
@@ -74,26 +110,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ipam_allocations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IpamPoolId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ipam_allocations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ipam_allocations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ipam_allocations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +143,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ipam_allocation</code>.
 ```sql
 SELECT
@@ -114,6 +164,21 @@ description
 FROM awscc.ec2.ipam_allocations
 WHERE region = 'us-east-1' AND data__Identifier = '<IpamPoolId>|<IpamPoolAllocationId>|<Cidr>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ipam_allocations</code> in a region.
+```sql
+SELECT
+region,
+ipam_pool_id,
+ipam_pool_allocation_id,
+cidr
+FROM awscc.ec2.ipam_allocations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -186,6 +251,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/ipam_allocations_list_only/index.md b/website/docs/services/ec2/ipam_allocations_list_only/index.md
deleted file mode 100644
index 3f535f59d..000000000
--- a/website/docs/services/ec2/ipam_allocations_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: ipam_allocations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ipam_allocations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ipam_allocations</code> in a region or regions, for all properties use <a href="/services/ec2/ipam_allocations/"><code>ipam_allocations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ipam_allocations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema of AWS::EC2::IPAMAllocation Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.ipam_allocations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "ipam_pool_allocation_id",
-    "type": "string",
-    "description": "Id of the allocation."
-  },
-  {
-    "name": "ipam_pool_id",
-    "type": "string",
-    "description": "Id of the IPAM Pool."
-  },
-  {
-    "name": "cidr",
-    "type": "string",
-    "description": "Represents a single IPv4 or IPv6 CIDR"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ipam_allocations</code> in a region.
-```sql
-SELECT
-region,
-ipam_pool_id,
-ipam_pool_allocation_id,
-cidr
-FROM awscc.ec2.ipam_allocations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ipam_allocations_list_only</code> resource, see <a href="/services/ec2/ipam_allocations/#permissions"><code>ipam_allocations</code></a>
-
diff --git a/website/docs/services/ec2/ipam_pool_cidrs/index.md b/website/docs/services/ec2/ipam_pool_cidrs/index.md
index 09fce857c..df3a7bbda 100644
--- a/website/docs/services/ec2/ipam_pool_cidrs/index.md
+++ b/website/docs/services/ec2/ipam_pool_cidrs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ipam_pool_cidr</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ipam_pool_cidr_id",
@@ -65,6 +74,33 @@ Creates, updates, deletes or gets an <code>ipam_pool_cidr</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "ipam_pool_cidr_id",
+    "type": "string",
+    "description": "Id of the IPAM Pool Cidr."
+  },
+  {
+    "name": "ipam_pool_id",
+    "type": "string",
+    "description": "Id of the IPAM Pool."
+  },
+  {
+    "name": "cidr",
+    "type": "string",
+    "description": "Represents a single IPv4 or IPv6 CIDR"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampoolcidr.html"><code>AWS::EC2::IPAMPoolCidr</code></a>.
 
@@ -74,26 +110,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ipam_pool_cidrs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IpamPoolId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ipam_pool_cidrs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ipam_pool_cidrs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ipam_pool_cidrs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +143,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ipam_pool_cidr</code>.
 ```sql
 SELECT
@@ -114,6 +164,20 @@ state
 FROM awscc.ec2.ipam_pool_cidrs
 WHERE region = 'us-east-1' AND data__Identifier = '<IpamPoolId>|<IpamPoolCidrId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ipam_pool_cidrs</code> in a region.
+```sql
+SELECT
+region,
+ipam_pool_id,
+ipam_pool_cidr_id
+FROM awscc.ec2.ipam_pool_cidrs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -182,6 +246,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/ipam_pool_cidrs_list_only/index.md b/website/docs/services/ec2/ipam_pool_cidrs_list_only/index.md
deleted file mode 100644
index a31a7fd7c..000000000
--- a/website/docs/services/ec2/ipam_pool_cidrs_list_only/index.md
+++ /dev/null
@@ -1,91 +0,0 @@
----
-title: ipam_pool_cidrs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ipam_pool_cidrs_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ipam_pool_cidrs</code> in a region or regions, for all properties use <a href="/services/ec2/ipam_pool_cidrs/"><code>ipam_pool_cidrs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ipam_pool_cidrs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema of AWS::EC2::IPAMPoolCidr Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.ipam_pool_cidrs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "ipam_pool_cidr_id",
-    "type": "string",
-    "description": "Id of the IPAM Pool Cidr."
-  },
-  {
-    "name": "ipam_pool_id",
-    "type": "string",
-    "description": "Id of the IPAM Pool."
-  },
-  {
-    "name": "cidr",
-    "type": "string",
-    "description": "Represents a single IPv4 or IPv6 CIDR"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ipam_pool_cidrs</code> in a region.
-```sql
-SELECT
-region,
-ipam_pool_id,
-ipam_pool_cidr_id
-FROM awscc.ec2.ipam_pool_cidrs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ipam_pool_cidrs_list_only</code> resource, see <a href="/services/ec2/ipam_pool_cidrs/#permissions"><code>ipam_pool_cidrs</code></a>
-
diff --git a/website/docs/services/ec2/ipam_pools/index.md b/website/docs/services/ec2/ipam_pools/index.md
index 042f3d83f..e4fd89f0a 100644
--- a/website/docs/services/ec2/ipam_pools/index.md
+++ b/website/docs/services/ec2/ipam_pools/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ipam_pool</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ipam_pool_id",
@@ -201,6 +210,23 @@ Creates, updates, deletes or gets an <code>ipam_pool</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "ipam_pool_id",
+    "type": "string",
+    "description": "Id of the IPAM Pool."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html"><code>AWS::EC2::IPAMPool</code></a>.
 
@@ -210,31 +236,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ipam_pools</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IpamScopeId, AddressFamily, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ipam_pools</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ipam_pools</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ipam_pools_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ipam_pools</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -243,6 +275,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ipam_pool</code>.
 ```sql
 SELECT
@@ -274,6 +315,19 @@ tags
 FROM awscc.ec2.ipam_pools
 WHERE region = 'us-east-1' AND data__Identifier = '<IpamPoolId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ipam_pools</code> in a region.
+```sql
+SELECT
+region,
+ipam_pool_id
+FROM awscc.ec2.ipam_pools_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -404,6 +458,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.ipam_pools
+SET data__PatchDocument = string('{{ {
+    "AllocationMinNetmaskLength": allocation_min_netmask_length,
+    "AllocationDefaultNetmaskLength": allocation_default_netmask_length,
+    "AllocationMaxNetmaskLength": allocation_max_netmask_length,
+    "AllocationResourceTags": allocation_resource_tags,
+    "AutoImport": auto_import,
+    "Description": description,
+    "ProvisionedCidrs": provisioned_cidrs,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IpamPoolId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/ipam_pools_list_only/index.md b/website/docs/services/ec2/ipam_pools_list_only/index.md
deleted file mode 100644
index fceb30859..000000000
--- a/website/docs/services/ec2/ipam_pools_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: ipam_pools_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ipam_pools_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ipam_pools</code> in a region or regions, for all properties use <a href="/services/ec2/ipam_pools/"><code>ipam_pools</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ipam_pools_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema of AWS::EC2::IPAMPool Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.ipam_pools_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "ipam_pool_id",
-    "type": "string",
-    "description": "Id of the IPAM Pool."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ipam_pools</code> in a region.
-```sql
-SELECT
-region,
-ipam_pool_id
-FROM awscc.ec2.ipam_pools_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ipam_pools_list_only</code> resource, see <a href="/services/ec2/ipam_pools/#permissions"><code>ipam_pools</code></a>
-
diff --git a/website/docs/services/ec2/ipam_resource_discoveries/index.md b/website/docs/services/ec2/ipam_resource_discoveries/index.md
index 7db86c24b..32125101a 100644
--- a/website/docs/services/ec2/ipam_resource_discoveries/index.md
+++ b/website/docs/services/ec2/ipam_resource_discoveries/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ipam_resource_discovery</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ipam_resource_discovery_id",
@@ -116,6 +125,23 @@ Creates, updates, deletes or gets an <code>ipam_resource_discovery</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "ipam_resource_discovery_id",
+    "type": "string",
+    "description": "Id of the IPAM Pool."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamresourcediscovery.html"><code>AWS::EC2::IPAMResourceDiscovery</code></a>.
 
@@ -125,31 +151,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ipam_resource_discoveries</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ipam_resource_discoveries</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ipam_resource_discoveries</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ipam_resource_discoveries_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ipam_resource_discoveries</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -158,6 +190,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ipam_resource_discovery</code>.
 ```sql
 SELECT
@@ -175,6 +216,19 @@ tags
 FROM awscc.ec2.ipam_resource_discoveries
 WHERE region = 'us-east-1' AND data__Identifier = '<IpamResourceDiscoveryId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ipam_resource_discoveries</code> in a region.
+```sql
+SELECT
+region,
+ipam_resource_discovery_id
+FROM awscc.ec2.ipam_resource_discoveries_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -251,6 +305,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.ipam_resource_discoveries
+SET data__PatchDocument = string('{{ {
+    "OperatingRegions": operating_regions,
+    "Description": description,
+    "OrganizationalUnitExclusions": organizational_unit_exclusions,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IpamResourceDiscoveryId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/ipam_resource_discoveries_list_only/index.md b/website/docs/services/ec2/ipam_resource_discoveries_list_only/index.md
deleted file mode 100644
index 1273d6809..000000000
--- a/website/docs/services/ec2/ipam_resource_discoveries_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: ipam_resource_discoveries_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ipam_resource_discoveries_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ipam_resource_discoveries</code> in a region or regions, for all properties use <a href="/services/ec2/ipam_resource_discoveries/"><code>ipam_resource_discoveries</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ipam_resource_discoveries_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema of AWS::EC2::IPAMResourceDiscovery Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.ipam_resource_discoveries_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "ipam_resource_discovery_id",
-    "type": "string",
-    "description": "Id of the IPAM Pool."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ipam_resource_discoveries</code> in a region.
-```sql
-SELECT
-region,
-ipam_resource_discovery_id
-FROM awscc.ec2.ipam_resource_discoveries_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ipam_resource_discoveries_list_only</code> resource, see <a href="/services/ec2/ipam_resource_discoveries/#permissions"><code>ipam_resource_discoveries</code></a>
-
diff --git a/website/docs/services/ec2/ipam_resource_discovery_associations/index.md b/website/docs/services/ec2/ipam_resource_discovery_associations/index.md
index afbe9b3b8..6dc81cca3 100644
--- a/website/docs/services/ec2/ipam_resource_discovery_associations/index.md
+++ b/website/docs/services/ec2/ipam_resource_discovery_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ipam_resource_discovery_association</
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ipam_arn",
@@ -107,6 +116,23 @@ Creates, updates, deletes or gets an <code>ipam_resource_discovery_association</
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "ipam_resource_discovery_association_id",
+    "type": "string",
+    "description": "Id of the IPAM Resource Discovery Association."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamresourcediscoveryassociation.html"><code>AWS::EC2::IPAMResourceDiscoveryAssociation</code></a>.
 
@@ -116,31 +142,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ipam_resource_discovery_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IpamId, IpamResourceDiscoveryId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ipam_resource_discovery_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ipam_resource_discovery_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ipam_resource_discovery_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ipam_resource_discovery_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -149,6 +181,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ipam_resource_discovery_association</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ tags
 FROM awscc.ec2.ipam_resource_discovery_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<IpamResourceDiscoveryAssociationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ipam_resource_discovery_associations</code> in a region.
+```sql
+SELECT
+region,
+ipam_resource_discovery_association_id
+FROM awscc.ec2.ipam_resource_discovery_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -239,6 +293,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.ipam_resource_discovery_associations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IpamResourceDiscoveryAssociationId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/ipam_resource_discovery_associations_list_only/index.md b/website/docs/services/ec2/ipam_resource_discovery_associations_list_only/index.md
deleted file mode 100644
index bfd6f0341..000000000
--- a/website/docs/services/ec2/ipam_resource_discovery_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: ipam_resource_discovery_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ipam_resource_discovery_associations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ipam_resource_discovery_associations</code> in a region or regions, for all properties use <a href="/services/ec2/ipam_resource_discovery_associations/"><code>ipam_resource_discovery_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ipam_resource_discovery_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema of AWS::EC2::IPAMResourceDiscoveryAssociation Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.ipam_resource_discovery_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "ipam_resource_discovery_association_id",
-    "type": "string",
-    "description": "Id of the IPAM Resource Discovery Association."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ipam_resource_discovery_associations</code> in a region.
-```sql
-SELECT
-region,
-ipam_resource_discovery_association_id
-FROM awscc.ec2.ipam_resource_discovery_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ipam_resource_discovery_associations_list_only</code> resource, see <a href="/services/ec2/ipam_resource_discovery_associations/#permissions"><code>ipam_resource_discovery_associations</code></a>
-
diff --git a/website/docs/services/ec2/ipam_scopes/index.md b/website/docs/services/ec2/ipam_scopes/index.md
index f9a8ed0a7..b5ea09225 100644
--- a/website/docs/services/ec2/ipam_scopes/index.md
+++ b/website/docs/services/ec2/ipam_scopes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ipam_scope</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ipam_scope_id",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets an <code>ipam_scope</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "ipam_scope_id",
+    "type": "string",
+    "description": "Id of the IPAM scope."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamscope.html"><code>AWS::EC2::IPAMScope</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ipam_scopes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IpamId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ipam_scopes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ipam_scopes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ipam_scopes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ipam_scopes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ipam_scope</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ tags
 FROM awscc.ec2.ipam_scopes
 WHERE region = 'us-east-1' AND data__Identifier = '<IpamScopeId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ipam_scopes</code> in a region.
+```sql
+SELECT
+region,
+ipam_scope_id
+FROM awscc.ec2.ipam_scopes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -225,6 +279,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.ipam_scopes
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IpamScopeId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/ipam_scopes_list_only/index.md b/website/docs/services/ec2/ipam_scopes_list_only/index.md
deleted file mode 100644
index 0f68a6886..000000000
--- a/website/docs/services/ec2/ipam_scopes_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: ipam_scopes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ipam_scopes_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ipam_scopes</code> in a region or regions, for all properties use <a href="/services/ec2/ipam_scopes/"><code>ipam_scopes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ipam_scopes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema of AWS::EC2::IPAMScope Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.ipam_scopes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "ipam_scope_id",
-    "type": "string",
-    "description": "Id of the IPAM scope."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ipam_scopes</code> in a region.
-```sql
-SELECT
-region,
-ipam_scope_id
-FROM awscc.ec2.ipam_scopes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ipam_scopes_list_only</code> resource, see <a href="/services/ec2/ipam_scopes/#permissions"><code>ipam_scopes</code></a>
-
diff --git a/website/docs/services/ec2/ipams/index.md b/website/docs/services/ec2/ipams/index.md
index 091139b6a..98a843429 100644
--- a/website/docs/services/ec2/ipams/index.md
+++ b/website/docs/services/ec2/ipams/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ipam</code> resource or lists <code>i
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ipam_id",
@@ -141,6 +150,23 @@ Creates, updates, deletes or gets an <code>ipam</code> resource or lists <code>i
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "ipam_id",
+    "type": "string",
+    "description": "Id of the IPAM."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipam.html"><code>AWS::EC2::IPAM</code></a>.
 
@@ -150,31 +176,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ipams</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ipams</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ipams</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ipams_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ipams</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -183,6 +215,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ipam</code>.
 ```sql
 SELECT
@@ -205,6 +246,19 @@ tags
 FROM awscc.ec2.ipams
 WHERE region = 'us-east-1' AND data__Identifier = '<IpamId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ipams</code> in a region.
+```sql
+SELECT
+region,
+ipam_id
+FROM awscc.ec2.ipams_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -293,6 +347,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.ipams
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "OperatingRegions": operating_regions,
+    "Tier": tier,
+    "EnablePrivateGua": enable_private_gua,
+    "MeteredAccount": metered_account,
+    "DefaultResourceDiscoveryOrganizationalUnitExclusions": default_resource_discovery_organizational_unit_exclusions,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IpamId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/ipams_list_only/index.md b/website/docs/services/ec2/ipams_list_only/index.md
deleted file mode 100644
index c7c3a75a5..000000000
--- a/website/docs/services/ec2/ipams_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: ipams_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ipams_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ipams</code> in a region or regions, for all properties use <a href="/services/ec2/ipams/"><code>ipams</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ipams_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema of AWS::EC2::IPAM Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.ipams_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "ipam_id",
-    "type": "string",
-    "description": "Id of the IPAM."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ipams</code> in a region.
-```sql
-SELECT
-region,
-ipam_id
-FROM awscc.ec2.ipams_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ipams_list_only</code> resource, see <a href="/services/ec2/ipams/#permissions"><code>ipams</code></a>
-
diff --git a/website/docs/services/ec2/key_pairs/index.md b/website/docs/services/ec2/key_pairs/index.md
index da1a9e3ac..65354d0cc 100644
--- a/website/docs/services/ec2/key_pairs/index.md
+++ b/website/docs/services/ec2/key_pairs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>key_pair</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "key_name",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>key_pair</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "key_name",
+    "type": "string",
+    "description": "A unique name for the key pair.<br />Constraints: Up to 255 ASCII characters"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-keypair.html"><code>AWS::EC2::KeyPair</code></a>.
 
@@ -96,26 +122,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>key_pairs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="KeyName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>key_pairs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>key_pairs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>key_pairs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +155,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>key_pair</code>.
 ```sql
 SELECT
@@ -138,6 +178,19 @@ tags
 FROM awscc.ec2.key_pairs
 WHERE region = 'us-east-1' AND data__Identifier = '<KeyName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>key_pairs</code> in a region.
+```sql
+SELECT
+region,
+key_name
+FROM awscc.ec2.key_pairs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -216,6 +269,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/key_pairs_list_only/index.md b/website/docs/services/ec2/key_pairs_list_only/index.md
deleted file mode 100644
index 19a2f36a5..000000000
--- a/website/docs/services/ec2/key_pairs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: key_pairs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - key_pairs_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>key_pairs</code> in a region or regions, for all properties use <a href="/services/ec2/key_pairs/"><code>key_pairs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>key_pairs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a key pair for use with an EC2long instance as follows:<br />+ To import an existing key pair, include the &#96;&#96;PublicKeyMaterial&#96;&#96; property.<br />+ To create a new key pair, omit the &#96;&#96;PublicKeyMaterial&#96;&#96; property.<br /><br />When you import an existing key pair, you specify the public key material for the key. We assume that you have the private key material for the key. CFNlong does not create or return the private key material when you import a key pair.<br />When you create a new key pair, the private key is saved to SYSlong Parameter Store, using a parameter with the following name: &#96;&#96;/ec2/keypair/&#123;key&#95;pair&#95;id&#125;&#96;&#96;. For more information about retrieving private key, and the required permissions, see &#91;Create a key pair using&#93;(https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/create-key-pairs.html#create-key-pair-cloudformation) in the &#42;User Guide&#42;.<br />When CFN deletes a key pair that was created or imported by a stack, it also deletes the parameter that was used to store the private key material in Parameter Store.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.key_pairs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "key_name",
-    "type": "string",
-    "description": "A unique name for the key pair.<br />Constraints: Up to 255 ASCII characters"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>key_pairs</code> in a region.
-```sql
-SELECT
-region,
-key_name
-FROM awscc.ec2.key_pairs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>key_pairs_list_only</code> resource, see <a href="/services/ec2/key_pairs/#permissions"><code>key_pairs</code></a>
-
diff --git a/website/docs/services/ec2/launch_templates/index.md b/website/docs/services/ec2/launch_templates/index.md
index 2ad386203..bfb411a40 100644
--- a/website/docs/services/ec2/launch_templates/index.md
+++ b/website/docs/services/ec2/launch_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>launch_template</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "launch_template_name",
@@ -977,6 +986,23 @@ Creates, updates, deletes or gets a <code>launch_template</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "launch_template_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html"><code>AWS::EC2::LaunchTemplate</code></a>.
 
@@ -986,31 +1012,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>launch_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LaunchTemplateData, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>launch_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>launch_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>launch_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>launch_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -1019,6 +1051,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>launch_template</code>.
 ```sql
 SELECT
@@ -1033,6 +1074,19 @@ default_version_number
 FROM awscc.ec2.launch_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<LaunchTemplateId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>launch_templates</code> in a region.
+```sql
+SELECT
+region,
+launch_template_id
+FROM awscc.ec2.launch_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1275,6 +1329,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.launch_templates
+SET data__PatchDocument = string('{{ {
+    "LaunchTemplateData": launch_template_data,
+    "VersionDescription": version_description,
+    "TagSpecifications": tag_specifications
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LaunchTemplateId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/launch_templates_list_only/index.md b/website/docs/services/ec2/launch_templates_list_only/index.md
deleted file mode 100644
index feaba8696..000000000
--- a/website/docs/services/ec2/launch_templates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: launch_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - launch_templates_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>launch_templates</code> in a region or regions, for all properties use <a href="/services/ec2/launch_templates/"><code>launch_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>launch_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies the properties for creating a launch template.<br />The minimum required properties for specifying a launch template are as follows:<br />+ You must specify at least one property for the launch template data.<br />+ You can optionally specify a name for the launch template. If you do not specify a name, CFN creates a name for you.<br /><br />A launch template can contain some or all of the configuration information to launch an instance. When you launch an instance using a launch template, instance properties that are not specified in the launch template use default values, except the &#96;&#96;ImageId&#96;&#96; property, which has no default value. If you do not specify an AMI ID for the launch template &#96;&#96;ImageId&#96;&#96; property, you must specify an AMI ID for the instance &#96;&#96;ImageId&#96;&#96; property.<br />For more information, see &#91;Launch an instance from a launch template&#93;(https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html) in the &#42;Amazon EC2 User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.launch_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "launch_template_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>launch_templates</code> in a region.
-```sql
-SELECT
-region,
-launch_template_id
-FROM awscc.ec2.launch_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>launch_templates_list_only</code> resource, see <a href="/services/ec2/launch_templates/#permissions"><code>launch_templates</code></a>
-
diff --git a/website/docs/services/ec2/local_gateway_route_table_virtual_interface_group_associations/index.md b/website/docs/services/ec2/local_gateway_route_table_virtual_interface_group_associations/index.md
index da4c47a47..d46f72690 100644
--- a/website/docs/services/ec2/local_gateway_route_table_virtual_interface_group_associations/index.md
+++ b/website/docs/services/ec2/local_gateway_route_table_virtual_interface_group_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>local_gateway_route_table_virtual_inte
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "local_gateway_route_table_virtual_interface_group_association_id",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>local_gateway_route_table_virtual_inte
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "local_gateway_route_table_virtual_interface_group_association_id",
+    "type": "string",
+    "description": "The ID of the local gateway route table virtual interface group association."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroutetablevirtualinterfacegroupassociation.html"><code>AWS::EC2::LocalGatewayRouteTableVirtualInterfaceGroupAssociation</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>local_gateway_route_table_virtual_interface_group_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LocalGatewayRouteTableId, LocalGatewayVirtualInterfaceGroupId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>local_gateway_route_table_virtual_interface_group_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>local_gateway_route_table_virtual_interface_group_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>local_gateway_route_table_virtual_interface_group_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>local_gateway_route_table_virtual_interface_group_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>local_gateway_route_table_virtual_interface_group_association</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.ec2.local_gateway_route_table_virtual_interface_group_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<LocalGatewayRouteTableVirtualInterfaceGroupAssociationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>local_gateway_route_table_virtual_interface_group_associations</code> in a region.
+```sql
+SELECT
+region,
+local_gateway_route_table_virtual_interface_group_association_id
+FROM awscc.ec2.local_gateway_route_table_virtual_interface_group_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -221,6 +275,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.local_gateway_route_table_virtual_interface_group_associations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LocalGatewayRouteTableVirtualInterfaceGroupAssociationId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/local_gateway_route_table_virtual_interface_group_associations_list_only/index.md b/website/docs/services/ec2/local_gateway_route_table_virtual_interface_group_associations_list_only/index.md
deleted file mode 100644
index 70c00da27..000000000
--- a/website/docs/services/ec2/local_gateway_route_table_virtual_interface_group_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: local_gateway_route_table_virtual_interface_group_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - local_gateway_route_table_virtual_interface_group_associations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>local_gateway_route_table_virtual_interface_group_associations</code> in a region or regions, for all properties use <a href="/services/ec2/local_gateway_route_table_virtual_interface_group_associations/"><code>local_gateway_route_table_virtual_interface_group_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>local_gateway_route_table_virtual_interface_group_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for Local Gateway Route Table Virtual Interface Group Association which describes a local gateway route table virtual interface group association for a local gateway.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.local_gateway_route_table_virtual_interface_group_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "local_gateway_route_table_virtual_interface_group_association_id",
-    "type": "string",
-    "description": "The ID of the local gateway route table virtual interface group association."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>local_gateway_route_table_virtual_interface_group_associations</code> in a region.
-```sql
-SELECT
-region,
-local_gateway_route_table_virtual_interface_group_association_id
-FROM awscc.ec2.local_gateway_route_table_virtual_interface_group_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>local_gateway_route_table_virtual_interface_group_associations_list_only</code> resource, see <a href="/services/ec2/local_gateway_route_table_virtual_interface_group_associations/#permissions"><code>local_gateway_route_table_virtual_interface_group_associations</code></a>
-
diff --git a/website/docs/services/ec2/local_gateway_route_tables/index.md b/website/docs/services/ec2/local_gateway_route_tables/index.md
index 464010ceb..a345f8b50 100644
--- a/website/docs/services/ec2/local_gateway_route_tables/index.md
+++ b/website/docs/services/ec2/local_gateway_route_tables/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>local_gateway_route_table</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "local_gateway_route_table_id",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>local_gateway_route_table</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "local_gateway_route_table_id",
+    "type": "string",
+    "description": "The ID of the local gateway route table."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroutetable.html"><code>AWS::EC2::LocalGatewayRouteTable</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>local_gateway_route_tables</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LocalGatewayId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>local_gateway_route_tables</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>local_gateway_route_tables</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>local_gateway_route_tables_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>local_gateway_route_tables</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>local_gateway_route_table</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.ec2.local_gateway_route_tables
 WHERE region = 'us-east-1' AND data__Identifier = '<LocalGatewayRouteTableId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>local_gateway_route_tables</code> in a region.
+```sql
+SELECT
+region,
+local_gateway_route_table_id
+FROM awscc.ec2.local_gateway_route_tables_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.local_gateway_route_tables
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LocalGatewayRouteTableId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/local_gateway_route_tables_list_only/index.md b/website/docs/services/ec2/local_gateway_route_tables_list_only/index.md
deleted file mode 100644
index fbbce47cd..000000000
--- a/website/docs/services/ec2/local_gateway_route_tables_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: local_gateway_route_tables_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - local_gateway_route_tables_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>local_gateway_route_tables</code> in a region or regions, for all properties use <a href="/services/ec2/local_gateway_route_tables/"><code>local_gateway_route_tables</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>local_gateway_route_tables_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for Local Gateway Route Table which describes a route table for a local gateway.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.local_gateway_route_tables_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "local_gateway_route_table_id",
-    "type": "string",
-    "description": "The ID of the local gateway route table."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>local_gateway_route_tables</code> in a region.
-```sql
-SELECT
-region,
-local_gateway_route_table_id
-FROM awscc.ec2.local_gateway_route_tables_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>local_gateway_route_tables_list_only</code> resource, see <a href="/services/ec2/local_gateway_route_tables/#permissions"><code>local_gateway_route_tables</code></a>
-
diff --git a/website/docs/services/ec2/local_gateway_route_tablevpc_associations/index.md b/website/docs/services/ec2/local_gateway_route_tablevpc_associations/index.md
index e100b81db..9be29c0b5 100644
--- a/website/docs/services/ec2/local_gateway_route_tablevpc_associations/index.md
+++ b/website/docs/services/ec2/local_gateway_route_tablevpc_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>local_gateway_route_tablevpc_associati
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "local_gateway_id",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>local_gateway_route_tablevpc_associati
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "local_gateway_route_table_vpc_association_id",
+    "type": "string",
+    "description": "The ID of the association."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroutetablevpcassociation.html"><code>AWS::EC2::LocalGatewayRouteTableVPCAssociation</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>local_gateway_route_tablevpc_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LocalGatewayRouteTableId, VpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>local_gateway_route_tablevpc_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>local_gateway_route_tablevpc_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>local_gateway_route_tablevpc_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>local_gateway_route_tablevpc_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>local_gateway_route_tablevpc_association</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.ec2.local_gateway_route_tablevpc_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<LocalGatewayRouteTableVpcAssociationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>local_gateway_route_tablevpc_associations</code> in a region.
+```sql
+SELECT
+region,
+local_gateway_route_table_vpc_association_id
+FROM awscc.ec2.local_gateway_route_tablevpc_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -209,6 +263,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.local_gateway_route_tablevpc_associations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LocalGatewayRouteTableVpcAssociationId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/local_gateway_route_tablevpc_associations_list_only/index.md b/website/docs/services/ec2/local_gateway_route_tablevpc_associations_list_only/index.md
deleted file mode 100644
index ee42c5058..000000000
--- a/website/docs/services/ec2/local_gateway_route_tablevpc_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: local_gateway_route_tablevpc_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - local_gateway_route_tablevpc_associations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>local_gateway_route_tablevpc_associations</code> in a region or regions, for all properties use <a href="/services/ec2/local_gateway_route_tablevpc_associations/"><code>local_gateway_route_tablevpc_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>local_gateway_route_tablevpc_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for Local Gateway Route Table VPC Association which describes an association between a local gateway route table and a VPC.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.local_gateway_route_tablevpc_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "local_gateway_route_table_vpc_association_id",
-    "type": "string",
-    "description": "The ID of the association."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>local_gateway_route_tablevpc_associations</code> in a region.
-```sql
-SELECT
-region,
-local_gateway_route_table_vpc_association_id
-FROM awscc.ec2.local_gateway_route_tablevpc_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>local_gateway_route_tablevpc_associations_list_only</code> resource, see <a href="/services/ec2/local_gateway_route_tablevpc_associations/#permissions"><code>local_gateway_route_tablevpc_associations</code></a>
-
diff --git a/website/docs/services/ec2/local_gateway_routes/index.md b/website/docs/services/ec2/local_gateway_routes/index.md
index eaa2cccc8..6d476641d 100644
--- a/website/docs/services/ec2/local_gateway_routes/index.md
+++ b/website/docs/services/ec2/local_gateway_routes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>local_gateway_route</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "destination_cidr_block",
@@ -70,6 +79,28 @@ Creates, updates, deletes or gets a <code>local_gateway_route</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "destination_cidr_block",
+    "type": "string",
+    "description": "The CIDR block used for destination matches."
+  },
+  {
+    "name": "local_gateway_route_table_id",
+    "type": "string",
+    "description": "The ID of the local gateway route table."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroute.html"><code>AWS::EC2::LocalGatewayRoute</code></a>.
 
@@ -79,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>local_gateway_routes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>local_gateway_routes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>local_gateway_routes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>local_gateway_routes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>local_gateway_routes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>local_gateway_route</code>.
 ```sql
 SELECT
@@ -125,6 +171,20 @@ type
 FROM awscc.ec2.local_gateway_routes
 WHERE region = 'us-east-1' AND data__Identifier = '<DestinationCidrBlock>|<LocalGatewayRouteTableId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>local_gateway_routes</code> in a region.
+```sql
+SELECT
+region,
+destination_cidr_block,
+local_gateway_route_table_id
+FROM awscc.ec2.local_gateway_routes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -203,6 +263,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.local_gateway_routes
+SET data__PatchDocument = string('{{ {
+    "LocalGatewayVirtualInterfaceGroupId": local_gateway_virtual_interface_group_id,
+    "NetworkInterfaceId": network_interface_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DestinationCidrBlock>|<LocalGatewayRouteTableId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/local_gateway_routes_list_only/index.md b/website/docs/services/ec2/local_gateway_routes_list_only/index.md
deleted file mode 100644
index efbbfdcaf..000000000
--- a/website/docs/services/ec2/local_gateway_routes_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: local_gateway_routes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - local_gateway_routes_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>local_gateway_routes</code> in a region or regions, for all properties use <a href="/services/ec2/local_gateway_routes/"><code>local_gateway_routes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>local_gateway_routes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for Local Gateway Route which describes a route for a local gateway route table.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.local_gateway_routes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "destination_cidr_block",
-    "type": "string",
-    "description": "The CIDR block used for destination matches."
-  },
-  {
-    "name": "local_gateway_route_table_id",
-    "type": "string",
-    "description": "The ID of the local gateway route table."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>local_gateway_routes</code> in a region.
-```sql
-SELECT
-region,
-destination_cidr_block,
-local_gateway_route_table_id
-FROM awscc.ec2.local_gateway_routes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>local_gateway_routes_list_only</code> resource, see <a href="/services/ec2/local_gateway_routes/#permissions"><code>local_gateway_routes</code></a>
-
diff --git a/website/docs/services/ec2/nat_gateways/index.md b/website/docs/services/ec2/nat_gateways/index.md
index 04dfe3c9f..c4748e090 100644
--- a/website/docs/services/ec2/nat_gateways/index.md
+++ b/website/docs/services/ec2/nat_gateways/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>nat_gateway</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "secondary_allocation_ids",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets a <code>nat_gateway</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "nat_gateway_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-natgateway.html"><code>AWS::EC2::NatGateway</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>nat_gateways</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>nat_gateways</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>nat_gateways</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>nat_gateways_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>nat_gateways</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>nat_gateway</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ max_drain_duration_seconds
 FROM awscc.ec2.nat_gateways
 WHERE region = 'us-east-1' AND data__Identifier = '<NatGatewayId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>nat_gateways</code> in a region.
+```sql
+SELECT
+region,
+nat_gateway_id
+FROM awscc.ec2.nat_gateways_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -273,6 +327,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.nat_gateways
+SET data__PatchDocument = string('{{ {
+    "SecondaryAllocationIds": secondary_allocation_ids,
+    "SecondaryPrivateIpAddressCount": secondary_private_ip_address_count,
+    "SecondaryPrivateIpAddresses": secondary_private_ip_addresses,
+    "Tags": tags,
+    "MaxDrainDurationSeconds": max_drain_duration_seconds
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<NatGatewayId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/nat_gateways_list_only/index.md b/website/docs/services/ec2/nat_gateways_list_only/index.md
deleted file mode 100644
index f6b9c4bb0..000000000
--- a/website/docs/services/ec2/nat_gateways_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: nat_gateways_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - nat_gateways_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>nat_gateways</code> in a region or regions, for all properties use <a href="/services/ec2/nat_gateways/"><code>nat_gateways</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>nat_gateways_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a network address translation (NAT) gateway in the specified subnet. You can create either a public NAT gateway or a private NAT gateway. The default is a public NAT gateway. If you create a public NAT gateway, you must specify an elastic IP address.<br />With a NAT gateway, instances in a private subnet can connect to the internet, other AWS services, or an on-premises network using the IP address of the NAT gateway. For more information, see &#91;NAT gateways&#93;(https://docs.aws.amazon.com/vpc/latest/userguide/vpc-nat-gateway.html) in the &#42;Amazon VPC User Guide&#42;.<br />If you add a default route (&#96;&#96;AWS::EC2::Route&#96;&#96; resource) that points to a NAT gateway, specify the NAT gateway ID for the route's &#96;&#96;NatGatewayId&#96;&#96; property.<br />When you associate an Elastic IP address or secondary Elastic IP address with a public NAT gateway, the network border group of the Elastic IP address must match the network border group of the Availability Zone (AZ) that the public NAT gateway is in. Otherwise, the NAT gateway fails to launch. You can see the network border group for the AZ by viewing the details of the subnet. Similarly, you can view the network border group for the Elastic IP address by viewing its details. For more information, see &#91;Allocate an Elastic IP address&#93;(https://docs.aws.amazon.com/vpc/latest/userguide/vpc-eips.html#allocate-eip) in the &#42;Amazon VPC User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.nat_gateways_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "nat_gateway_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>nat_gateways</code> in a region.
-```sql
-SELECT
-region,
-nat_gateway_id
-FROM awscc.ec2.nat_gateways_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>nat_gateways_list_only</code> resource, see <a href="/services/ec2/nat_gateways/#permissions"><code>nat_gateways</code></a>
-
diff --git a/website/docs/services/ec2/network_acls/index.md b/website/docs/services/ec2/network_acls/index.md
index 1a7aa12f1..8fec18271 100644
--- a/website/docs/services/ec2/network_acls/index.md
+++ b/website/docs/services/ec2/network_acls/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>network_acl</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "vpc_id",
@@ -67,6 +76,23 @@ Creates, updates, deletes or gets a <code>network_acl</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkacl.html"><code>AWS::EC2::NetworkAcl</code></a>.
 
@@ -76,31 +102,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>network_acls</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>network_acls</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>network_acls</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>network_acls_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>network_acls</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -109,6 +141,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>network_acl</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ tags
 FROM awscc.ec2.network_acls
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>network_acls</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.network_acls_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -185,6 +239,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.network_acls
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/network_acls_list_only/index.md b/website/docs/services/ec2/network_acls_list_only/index.md
deleted file mode 100644
index 5e43b739c..000000000
--- a/website/docs/services/ec2/network_acls_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: network_acls_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - network_acls_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>network_acls</code> in a region or regions, for all properties use <a href="/services/ec2/network_acls/"><code>network_acls</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>network_acls_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a network ACL for your VPC.<br />To add a network ACL entry, see &#91;AWS::EC2::NetworkAclEntry&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkaclentry.html).</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.network_acls_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>network_acls</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.network_acls_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>network_acls_list_only</code> resource, see <a href="/services/ec2/network_acls/#permissions"><code>network_acls</code></a>
-
diff --git a/website/docs/services/ec2/network_insights_access_scope_analyses/index.md b/website/docs/services/ec2/network_insights_access_scope_analyses/index.md
index 9062e14df..444a096b2 100644
--- a/website/docs/services/ec2/network_insights_access_scope_analyses/index.md
+++ b/website/docs/services/ec2/network_insights_access_scope_analyses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>network_insights_access_scope_analysis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "network_insights_access_scope_analysis_id",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets a <code>network_insights_access_scope_analysis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "network_insights_access_scope_analysis_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightsaccessscopeanalysis.html"><code>AWS::EC2::NetworkInsightsAccessScopeAnalysis</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>network_insights_access_scope_analyses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="NetworkInsightsAccessScopeId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>network_insights_access_scope_analyses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>network_insights_access_scope_analyses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>network_insights_access_scope_analyses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>network_insights_access_scope_analyses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>network_insights_access_scope_analysis</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ tags
 FROM awscc.ec2.network_insights_access_scope_analyses
 WHERE region = 'us-east-1' AND data__Identifier = '<NetworkInsightsAccessScopeAnalysisId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>network_insights_access_scope_analyses</code> in a region.
+```sql
+SELECT
+region,
+network_insights_access_scope_analysis_id
+FROM awscc.ec2.network_insights_access_scope_analyses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -227,6 +281,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.network_insights_access_scope_analyses
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<NetworkInsightsAccessScopeAnalysisId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/network_insights_access_scope_analyses_list_only/index.md b/website/docs/services/ec2/network_insights_access_scope_analyses_list_only/index.md
deleted file mode 100644
index 2da92532b..000000000
--- a/website/docs/services/ec2/network_insights_access_scope_analyses_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: network_insights_access_scope_analyses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - network_insights_access_scope_analyses_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>network_insights_access_scope_analyses</code> in a region or regions, for all properties use <a href="/services/ec2/network_insights_access_scope_analyses/"><code>network_insights_access_scope_analyses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>network_insights_access_scope_analyses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::EC2::NetworkInsightsAccessScopeAnalysis</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.network_insights_access_scope_analyses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "network_insights_access_scope_analysis_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>network_insights_access_scope_analyses</code> in a region.
-```sql
-SELECT
-region,
-network_insights_access_scope_analysis_id
-FROM awscc.ec2.network_insights_access_scope_analyses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>network_insights_access_scope_analyses_list_only</code> resource, see <a href="/services/ec2/network_insights_access_scope_analyses/#permissions"><code>network_insights_access_scope_analyses</code></a>
-
diff --git a/website/docs/services/ec2/network_insights_access_scopes/index.md b/website/docs/services/ec2/network_insights_access_scopes/index.md
index 7bb91c14d..38b13fc89 100644
--- a/website/docs/services/ec2/network_insights_access_scopes/index.md
+++ b/website/docs/services/ec2/network_insights_access_scopes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>network_insights_access_scope</code> r
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "network_insights_access_scope_id",
@@ -179,6 +188,23 @@ Creates, updates, deletes or gets a <code>network_insights_access_scope</code> r
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "network_insights_access_scope_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightsaccessscope.html"><code>AWS::EC2::NetworkInsightsAccessScope</code></a>.
 
@@ -188,31 +214,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>network_insights_access_scopes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>network_insights_access_scopes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>network_insights_access_scopes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>network_insights_access_scopes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>network_insights_access_scopes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -221,6 +253,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>network_insights_access_scope</code>.
 ```sql
 SELECT
@@ -235,6 +276,19 @@ exclude_paths
 FROM awscc.ec2.network_insights_access_scopes
 WHERE region = 'us-east-1' AND data__Identifier = '<NetworkInsightsAccessScopeId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>network_insights_access_scopes</code> in a region.
+```sql
+SELECT
+region,
+network_insights_access_scope_id
+FROM awscc.ec2.network_insights_access_scopes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -334,6 +388,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.network_insights_access_scopes
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<NetworkInsightsAccessScopeId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/network_insights_access_scopes_list_only/index.md b/website/docs/services/ec2/network_insights_access_scopes_list_only/index.md
deleted file mode 100644
index c2eab3f28..000000000
--- a/website/docs/services/ec2/network_insights_access_scopes_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: network_insights_access_scopes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - network_insights_access_scopes_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>network_insights_access_scopes</code> in a region or regions, for all properties use <a href="/services/ec2/network_insights_access_scopes/"><code>network_insights_access_scopes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>network_insights_access_scopes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::EC2::NetworkInsightsAccessScope</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.network_insights_access_scopes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "network_insights_access_scope_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>network_insights_access_scopes</code> in a region.
-```sql
-SELECT
-region,
-network_insights_access_scope_id
-FROM awscc.ec2.network_insights_access_scopes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>network_insights_access_scopes_list_only</code> resource, see <a href="/services/ec2/network_insights_access_scopes/#permissions"><code>network_insights_access_scopes</code></a>
-
diff --git a/website/docs/services/ec2/network_insights_analyses/index.md b/website/docs/services/ec2/network_insights_analyses/index.md
index d9c71f09e..53b0c7f7f 100644
--- a/website/docs/services/ec2/network_insights_analyses/index.md
+++ b/website/docs/services/ec2/network_insights_analyses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>network_insights_analysis</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "status",
@@ -1005,6 +1014,23 @@ Creates, updates, deletes or gets a <code>network_insights_analysis</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "network_insights_analysis_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightsanalysis.html"><code>AWS::EC2::NetworkInsightsAnalysis</code></a>.
 
@@ -1014,31 +1040,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>network_insights_analyses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="NetworkInsightsPathId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>network_insights_analyses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>network_insights_analyses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>network_insights_analyses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>network_insights_analyses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -1047,6 +1079,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>network_insights_analysis</code>.
 ```sql
 SELECT
@@ -1070,6 +1111,19 @@ tags
 FROM awscc.ec2.network_insights_analyses
 WHERE region = 'us-east-1' AND data__Identifier = '<NetworkInsightsAnalysisId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>network_insights_analyses</code> in a region.
+```sql
+SELECT
+region,
+network_insights_analysis_id
+FROM awscc.ec2.network_insights_analyses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1151,6 +1205,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.network_insights_analyses
+SET data__PatchDocument = string('{{ {
+    "AdditionalAccounts": additional_accounts,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<NetworkInsightsAnalysisId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/network_insights_analyses_list_only/index.md b/website/docs/services/ec2/network_insights_analyses_list_only/index.md
deleted file mode 100644
index b313f9668..000000000
--- a/website/docs/services/ec2/network_insights_analyses_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: network_insights_analyses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - network_insights_analyses_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>network_insights_analyses</code> in a region or regions, for all properties use <a href="/services/ec2/network_insights_analyses/"><code>network_insights_analyses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>network_insights_analyses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::EC2::NetworkInsightsAnalysis</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.network_insights_analyses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "network_insights_analysis_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>network_insights_analyses</code> in a region.
-```sql
-SELECT
-region,
-network_insights_analysis_id
-FROM awscc.ec2.network_insights_analyses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>network_insights_analyses_list_only</code> resource, see <a href="/services/ec2/network_insights_analyses/#permissions"><code>network_insights_analyses</code></a>
-
diff --git a/website/docs/services/ec2/network_insights_paths/index.md b/website/docs/services/ec2/network_insights_paths/index.md
index 3a102fc34..fd4c3e5f2 100644
--- a/website/docs/services/ec2/network_insights_paths/index.md
+++ b/website/docs/services/ec2/network_insights_paths/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>network_insights_path</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "network_insights_path_id",
@@ -131,6 +140,23 @@ Creates, updates, deletes or gets a <code>network_insights_path</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "network_insights_path_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightspath.html"><code>AWS::EC2::NetworkInsightsPath</code></a>.
 
@@ -140,31 +166,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>network_insights_paths</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Protocol, Source, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>network_insights_paths</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>network_insights_paths</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>network_insights_paths_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>network_insights_paths</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -173,6 +205,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>network_insights_path</code>.
 ```sql
 SELECT
@@ -194,6 +235,19 @@ tags
 FROM awscc.ec2.network_insights_paths
 WHERE region = 'us-east-1' AND data__Identifier = '<NetworkInsightsPathId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>network_insights_paths</code> in a region.
+```sql
+SELECT
+region,
+network_insights_path_id
+FROM awscc.ec2.network_insights_paths_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -296,6 +350,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.network_insights_paths
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<NetworkInsightsPathId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/network_insights_paths_list_only/index.md b/website/docs/services/ec2/network_insights_paths_list_only/index.md
deleted file mode 100644
index 4e470f2c1..000000000
--- a/website/docs/services/ec2/network_insights_paths_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: network_insights_paths_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - network_insights_paths_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>network_insights_paths</code> in a region or regions, for all properties use <a href="/services/ec2/network_insights_paths/"><code>network_insights_paths</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>network_insights_paths_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::EC2::NetworkInsightsPath</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.network_insights_paths_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "network_insights_path_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>network_insights_paths</code> in a region.
-```sql
-SELECT
-region,
-network_insights_path_id
-FROM awscc.ec2.network_insights_paths_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>network_insights_paths_list_only</code> resource, see <a href="/services/ec2/network_insights_paths/#permissions"><code>network_insights_paths</code></a>
-
diff --git a/website/docs/services/ec2/network_interface_attachments/index.md b/website/docs/services/ec2/network_interface_attachments/index.md
index c494c6504..d54cd8767 100644
--- a/website/docs/services/ec2/network_interface_attachments/index.md
+++ b/website/docs/services/ec2/network_interface_attachments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>network_interface_attachment</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "attachment_id",
@@ -89,6 +98,23 @@ Creates, updates, deletes or gets a <code>network_interface_attachment</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "attachment_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterfaceattachment.html"><code>AWS::EC2::NetworkInterfaceAttachment</code></a>.
 
@@ -98,31 +124,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>network_interface_attachments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DeviceIndex, InstanceId, NetworkInterfaceId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>network_interface_attachments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>network_interface_attachments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>network_interface_attachments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>network_interface_attachments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -131,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>network_interface_attachment</code>.
 ```sql
 SELECT
@@ -144,6 +185,19 @@ ena_srd_specification
 FROM awscc.ec2.network_interface_attachments
 WHERE region = 'us-east-1' AND data__Identifier = '<AttachmentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>network_interface_attachments</code> in a region.
+```sql
+SELECT
+region,
+attachment_id
+FROM awscc.ec2.network_interface_attachments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -227,6 +281,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.network_interface_attachments
+SET data__PatchDocument = string('{{ {
+    "DeleteOnTermination": delete_on_termination,
+    "EnaSrdSpecification": ena_srd_specification
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AttachmentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/network_interface_attachments_list_only/index.md b/website/docs/services/ec2/network_interface_attachments_list_only/index.md
deleted file mode 100644
index e06fcb4b3..000000000
--- a/website/docs/services/ec2/network_interface_attachments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: network_interface_attachments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - network_interface_attachments_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>network_interface_attachments</code> in a region or regions, for all properties use <a href="/services/ec2/network_interface_attachments/"><code>network_interface_attachments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>network_interface_attachments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Attaches an elastic network interface (ENI) to an Amazon EC2 instance. You can use this resource type to attach additional network interfaces to an instance without interruption.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.network_interface_attachments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "attachment_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>network_interface_attachments</code> in a region.
-```sql
-SELECT
-region,
-attachment_id
-FROM awscc.ec2.network_interface_attachments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>network_interface_attachments_list_only</code> resource, see <a href="/services/ec2/network_interface_attachments/#permissions"><code>network_interface_attachments</code></a>
-
diff --git a/website/docs/services/ec2/network_interfaces/index.md b/website/docs/services/ec2/network_interfaces/index.md
index 68aecb14d..61a9906b5 100644
--- a/website/docs/services/ec2/network_interfaces/index.md
+++ b/website/docs/services/ec2/network_interfaces/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>network_interface</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -212,6 +221,23 @@ Creates, updates, deletes or gets a <code>network_interface</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Network interface id."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterface.html"><code>AWS::EC2::NetworkInterface</code></a>.
 
@@ -221,31 +247,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>network_interfaces</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SubnetId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>network_interfaces</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>network_interfaces</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>network_interfaces_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>network_interfaces</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -254,6 +286,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>network_interface</code>.
 ```sql
 SELECT
@@ -283,6 +324,19 @@ connection_tracking_specification
 FROM awscc.ec2.network_interfaces
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>network_interfaces</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.network_interfaces_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -418,6 +472,32 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.network_interfaces
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "PrivateIpAddresses": private_ip_addresses,
+    "SecondaryPrivateIpAddressCount": secondary_private_ip_address_count,
+    "Ipv6PrefixCount": ipv6_prefix_count,
+    "Ipv4Prefixes": ipv4_prefixes,
+    "Ipv4PrefixCount": ipv4_prefix_count,
+    "EnablePrimaryIpv6": enable_primary_ipv6,
+    "GroupSet": group_set,
+    "Ipv6Addresses": ipv6_addresses,
+    "Ipv6Prefixes": ipv6_prefixes,
+    "SourceDestCheck": source_dest_check,
+    "Ipv6AddressCount": ipv6_address_count,
+    "Tags": tags,
+    "ConnectionTrackingSpecification": connection_tracking_specification
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/network_interfaces_list_only/index.md b/website/docs/services/ec2/network_interfaces_list_only/index.md
deleted file mode 100644
index 29f4c9c4d..000000000
--- a/website/docs/services/ec2/network_interfaces_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: network_interfaces_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - network_interfaces_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>network_interfaces</code> in a region or regions, for all properties use <a href="/services/ec2/network_interfaces/"><code>network_interfaces</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>network_interfaces_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::EC2::NetworkInterface resource creates network interface</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.network_interfaces_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Network interface id."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>network_interfaces</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.network_interfaces_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>network_interfaces_list_only</code> resource, see <a href="/services/ec2/network_interfaces/#permissions"><code>network_interfaces</code></a>
-
diff --git a/website/docs/services/ec2/network_performance_metric_subscriptions/index.md b/website/docs/services/ec2/network_performance_metric_subscriptions/index.md
index abe21d63c..7fbe1701b 100644
--- a/website/docs/services/ec2/network_performance_metric_subscriptions/index.md
+++ b/website/docs/services/ec2/network_performance_metric_subscriptions/index.md
@@ -33,6 +33,45 @@ Creates, updates, deletes or gets a <code>network_performance_metric_subscriptio
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "source",
+    "type": "string",
+    "description": "The starting Region or Availability Zone for metric to subscribe to."
+  },
+  {
+    "name": "destination",
+    "type": "string",
+    "description": "The target Region or Availability Zone for the metric to subscribe to."
+  },
+  {
+    "name": "metric",
+    "type": "string",
+    "description": "The metric type to subscribe to."
+  },
+  {
+    "name": "statistic",
+    "type": "string",
+    "description": "The statistic to subscribe to."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "source",
@@ -60,6 +99,8 @@ Creates, updates, deletes or gets a <code>network_performance_metric_subscriptio
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkperformancemetricsubscription.html"><code>AWS::EC2::NetworkPerformanceMetricSubscription</code></a>.
 
@@ -69,26 +110,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>network_performance_metric_subscriptions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Source, Destination, Metric, Statistic, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>network_performance_metric_subscriptions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>network_performance_metric_subscriptions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>network_performance_metric_subscriptions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +143,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>network_performance_metric_subscription</code>.
 ```sql
 SELECT
@@ -108,6 +163,22 @@ statistic
 FROM awscc.ec2.network_performance_metric_subscriptions
 WHERE region = 'us-east-1' AND data__Identifier = '<Source>|<Destination>|<Metric>|<Statistic>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>network_performance_metric_subscriptions</code> in a region.
+```sql
+SELECT
+region,
+source,
+destination,
+metric,
+statistic
+FROM awscc.ec2.network_performance_metric_subscriptions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -186,6 +257,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/network_performance_metric_subscriptions_list_only/index.md b/website/docs/services/ec2/network_performance_metric_subscriptions_list_only/index.md
deleted file mode 100644
index 1d4b6fc9e..000000000
--- a/website/docs/services/ec2/network_performance_metric_subscriptions_list_only/index.md
+++ /dev/null
@@ -1,98 +0,0 @@
----
-title: network_performance_metric_subscriptions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - network_performance_metric_subscriptions_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>network_performance_metric_subscriptions</code> in a region or regions, for all properties use <a href="/services/ec2/network_performance_metric_subscriptions/"><code>network_performance_metric_subscriptions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>network_performance_metric_subscriptions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::NetworkPerformanceMetricSubscription</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.network_performance_metric_subscriptions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "source",
-    "type": "string",
-    "description": "The starting Region or Availability Zone for metric to subscribe to."
-  },
-  {
-    "name": "destination",
-    "type": "string",
-    "description": "The target Region or Availability Zone for the metric to subscribe to."
-  },
-  {
-    "name": "metric",
-    "type": "string",
-    "description": "The metric type to subscribe to."
-  },
-  {
-    "name": "statistic",
-    "type": "string",
-    "description": "The statistic to subscribe to."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>network_performance_metric_subscriptions</code> in a region.
-```sql
-SELECT
-region,
-source,
-destination,
-metric,
-statistic
-FROM awscc.ec2.network_performance_metric_subscriptions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>network_performance_metric_subscriptions_list_only</code> resource, see <a href="/services/ec2/network_performance_metric_subscriptions/#permissions"><code>network_performance_metric_subscriptions</code></a>
-
diff --git a/website/docs/services/ec2/placement_groups/index.md b/website/docs/services/ec2/placement_groups/index.md
index 1cc36dea5..1127dc18b 100644
--- a/website/docs/services/ec2/placement_groups/index.md
+++ b/website/docs/services/ec2/placement_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>placement_group</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "strategy",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>placement_group</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "group_name",
+    "type": "string",
+    "description": "The Group Name of Placement Group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-placementgroup.html"><code>AWS::EC2::PlacementGroup</code></a>.
 
@@ -86,26 +112,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>placement_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>placement_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>placement_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>placement_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +145,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>placement_group</code>.
 ```sql
 SELECT
@@ -126,6 +166,19 @@ tags
 FROM awscc.ec2.placement_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<GroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>placement_groups</code> in a region.
+```sql
+SELECT
+region,
+group_name
+FROM awscc.ec2.placement_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -206,6 +259,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/placement_groups_list_only/index.md b/website/docs/services/ec2/placement_groups_list_only/index.md
deleted file mode 100644
index 903277b45..000000000
--- a/website/docs/services/ec2/placement_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: placement_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - placement_groups_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>placement_groups</code> in a region or regions, for all properties use <a href="/services/ec2/placement_groups/"><code>placement_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>placement_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::PlacementGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.placement_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "group_name",
-    "type": "string",
-    "description": "The Group Name of Placement Group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>placement_groups</code> in a region.
-```sql
-SELECT
-region,
-group_name
-FROM awscc.ec2.placement_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>placement_groups_list_only</code> resource, see <a href="/services/ec2/placement_groups/#permissions"><code>placement_groups</code></a>
-
diff --git a/website/docs/services/ec2/prefix_lists/index.md b/website/docs/services/ec2/prefix_lists/index.md
index ea93180ef..86886e179 100644
--- a/website/docs/services/ec2/prefix_lists/index.md
+++ b/website/docs/services/ec2/prefix_lists/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>prefix_list</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "prefix_list_name",
@@ -109,6 +118,23 @@ Creates, updates, deletes or gets a <code>prefix_list</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "prefix_list_id",
+    "type": "string",
+    "description": "Id of Prefix List."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-prefixlist.html"><code>AWS::EC2::PrefixList</code></a>.
 
@@ -118,31 +144,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>prefix_lists</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PrefixListName, AddressFamily, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>prefix_lists</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>prefix_lists</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>prefix_lists_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>prefix_lists</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +183,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>prefix_list</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ arn
 FROM awscc.ec2.prefix_lists
 WHERE region = 'us-east-1' AND data__Identifier = '<PrefixListId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>prefix_lists</code> in a region.
+```sql
+SELECT
+region,
+prefix_list_id
+FROM awscc.ec2.prefix_lists_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -249,6 +303,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.prefix_lists
+SET data__PatchDocument = string('{{ {
+    "PrefixListName": prefix_list_name,
+    "AddressFamily": address_family,
+    "MaxEntries": max_entries,
+    "Tags": tags,
+    "Entries": entries
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PrefixListId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/prefix_lists_list_only/index.md b/website/docs/services/ec2/prefix_lists_list_only/index.md
deleted file mode 100644
index 40e2bccfb..000000000
--- a/website/docs/services/ec2/prefix_lists_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: prefix_lists_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - prefix_lists_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>prefix_lists</code> in a region or regions, for all properties use <a href="/services/ec2/prefix_lists/"><code>prefix_lists</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>prefix_lists_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema of AWS::EC2::PrefixList Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.prefix_lists_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "prefix_list_id",
-    "type": "string",
-    "description": "Id of Prefix List."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>prefix_lists</code> in a region.
-```sql
-SELECT
-region,
-prefix_list_id
-FROM awscc.ec2.prefix_lists_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>prefix_lists_list_only</code> resource, see <a href="/services/ec2/prefix_lists/#permissions"><code>prefix_lists</code></a>
-
diff --git a/website/docs/services/ec2/route_server_associations/index.md b/website/docs/services/ec2/route_server_associations/index.md
index 9c94c44cf..804d4fc01 100644
--- a/website/docs/services/ec2/route_server_associations/index.md
+++ b/website/docs/services/ec2/route_server_associations/index.md
@@ -33,6 +33,35 @@ Creates, updates, deletes or gets a <code>route_server_association</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "route_server_id",
+    "type": "string",
+    "description": "Route Server ID"
+  },
+  {
+    "name": "vpc_id",
+    "type": "string",
+    "description": "VPC ID"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "route_server_id",
@@ -50,6 +79,8 @@ Creates, updates, deletes or gets a <code>route_server_association</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routeserverassociation.html"><code>AWS::EC2::RouteServerAssociation</code></a>.
 
@@ -59,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>route_server_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RouteServerId, VpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>route_server_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>route_server_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>route_server_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>route_server_association</code>.
 ```sql
 SELECT
@@ -96,6 +141,20 @@ vpc_id
 FROM awscc.ec2.route_server_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<RouteServerId>|<VpcId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>route_server_associations</code> in a region.
+```sql
+SELECT
+region,
+route_server_id,
+vpc_id
+FROM awscc.ec2.route_server_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -162,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/route_server_associations_list_only/index.md b/website/docs/services/ec2/route_server_associations_list_only/index.md
deleted file mode 100644
index 54c23b674..000000000
--- a/website/docs/services/ec2/route_server_associations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: route_server_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - route_server_associations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>route_server_associations</code> in a region or regions, for all properties use <a href="/services/ec2/route_server_associations/"><code>route_server_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>route_server_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>VPC Route Server Association</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.route_server_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "route_server_id",
-    "type": "string",
-    "description": "Route Server ID"
-  },
-  {
-    "name": "vpc_id",
-    "type": "string",
-    "description": "VPC ID"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>route_server_associations</code> in a region.
-```sql
-SELECT
-region,
-route_server_id,
-vpc_id
-FROM awscc.ec2.route_server_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>route_server_associations_list_only</code> resource, see <a href="/services/ec2/route_server_associations/#permissions"><code>route_server_associations</code></a>
-
diff --git a/website/docs/services/ec2/route_server_endpoints/index.md b/website/docs/services/ec2/route_server_endpoints/index.md
index be2eb6404..792df588e 100644
--- a/website/docs/services/ec2/route_server_endpoints/index.md
+++ b/website/docs/services/ec2/route_server_endpoints/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>route_server_endpoint</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "route_server_id",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>route_server_endpoint</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the Route Server Endpoint."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routeserverendpoint.html"><code>AWS::EC2::RouteServerEndpoint</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>route_server_endpoints</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RouteServerId, SubnetId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>route_server_endpoints</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>route_server_endpoints</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>route_server_endpoints_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>route_server_endpoints</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>route_server_endpoint</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.ec2.route_server_endpoints
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>route_server_endpoints</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.route_server_endpoints_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -221,6 +275,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.route_server_endpoints
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/route_server_endpoints_list_only/index.md b/website/docs/services/ec2/route_server_endpoints_list_only/index.md
deleted file mode 100644
index 4be23ee07..000000000
--- a/website/docs/services/ec2/route_server_endpoints_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: route_server_endpoints_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - route_server_endpoints_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>route_server_endpoints</code> in a region or regions, for all properties use <a href="/services/ec2/route_server_endpoints/"><code>route_server_endpoints</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>route_server_endpoints_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>VPC Route Server Endpoint</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.route_server_endpoints_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the Route Server Endpoint."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>route_server_endpoints</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.route_server_endpoints_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>route_server_endpoints_list_only</code> resource, see <a href="/services/ec2/route_server_endpoints/#permissions"><code>route_server_endpoints</code></a>
-
diff --git a/website/docs/services/ec2/route_server_peers/index.md b/website/docs/services/ec2/route_server_peers/index.md
index cc52cc105..40b87ff18 100644
--- a/website/docs/services/ec2/route_server_peers/index.md
+++ b/website/docs/services/ec2/route_server_peers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>route_server_peer</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "route_server_id",
@@ -119,6 +128,23 @@ Creates, updates, deletes or gets a <code>route_server_peer</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the Route Server Peer."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routeserverpeer.html"><code>AWS::EC2::RouteServerPeer</code></a>.
 
@@ -128,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>route_server_peers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RouteServerEndpointId, PeerAddress, BgpOptions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>route_server_peers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>route_server_peers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>route_server_peers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>route_server_peers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>route_server_peer</code>.
 ```sql
 SELECT
@@ -179,6 +220,19 @@ tags
 FROM awscc.ec2.route_server_peers
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>route_server_peers</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.route_server_peers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -259,6 +313,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.route_server_peers
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/route_server_peers_list_only/index.md b/website/docs/services/ec2/route_server_peers_list_only/index.md
deleted file mode 100644
index b33d1e54f..000000000
--- a/website/docs/services/ec2/route_server_peers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: route_server_peers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - route_server_peers_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>route_server_peers</code> in a region or regions, for all properties use <a href="/services/ec2/route_server_peers/"><code>route_server_peers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>route_server_peers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>VPC Route Server Peer</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.route_server_peers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the Route Server Peer."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>route_server_peers</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.route_server_peers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>route_server_peers_list_only</code> resource, see <a href="/services/ec2/route_server_peers/#permissions"><code>route_server_peers</code></a>
-
diff --git a/website/docs/services/ec2/route_server_propagations/index.md b/website/docs/services/ec2/route_server_propagations/index.md
index d6d73888e..3552de9d5 100644
--- a/website/docs/services/ec2/route_server_propagations/index.md
+++ b/website/docs/services/ec2/route_server_propagations/index.md
@@ -33,6 +33,35 @@ Creates, updates, deletes or gets a <code>route_server_propagation</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "route_server_id",
+    "type": "string",
+    "description": "Route Server ID"
+  },
+  {
+    "name": "route_table_id",
+    "type": "string",
+    "description": "Route Table ID"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "route_server_id",
@@ -50,6 +79,8 @@ Creates, updates, deletes or gets a <code>route_server_propagation</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routeserverpropagation.html"><code>AWS::EC2::RouteServerPropagation</code></a>.
 
@@ -59,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>route_server_propagations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RouteServerId, RouteTableId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>route_server_propagations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>route_server_propagations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>route_server_propagations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>route_server_propagation</code>.
 ```sql
 SELECT
@@ -96,6 +141,20 @@ route_table_id
 FROM awscc.ec2.route_server_propagations
 WHERE region = 'us-east-1' AND data__Identifier = '<RouteServerId>|<RouteTableId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>route_server_propagations</code> in a region.
+```sql
+SELECT
+region,
+route_server_id,
+route_table_id
+FROM awscc.ec2.route_server_propagations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -162,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/route_server_propagations_list_only/index.md b/website/docs/services/ec2/route_server_propagations_list_only/index.md
deleted file mode 100644
index 0c0cb3f45..000000000
--- a/website/docs/services/ec2/route_server_propagations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: route_server_propagations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - route_server_propagations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>route_server_propagations</code> in a region or regions, for all properties use <a href="/services/ec2/route_server_propagations/"><code>route_server_propagations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>route_server_propagations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>VPC Route Server Propagation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.route_server_propagations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "route_server_id",
-    "type": "string",
-    "description": "Route Server ID"
-  },
-  {
-    "name": "route_table_id",
-    "type": "string",
-    "description": "Route Table ID"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>route_server_propagations</code> in a region.
-```sql
-SELECT
-region,
-route_server_id,
-route_table_id
-FROM awscc.ec2.route_server_propagations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>route_server_propagations_list_only</code> resource, see <a href="/services/ec2/route_server_propagations/#permissions"><code>route_server_propagations</code></a>
-
diff --git a/website/docs/services/ec2/route_servers/index.md b/website/docs/services/ec2/route_servers/index.md
index 0e47b7da7..7696577fa 100644
--- a/website/docs/services/ec2/route_servers/index.md
+++ b/website/docs/services/ec2/route_servers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>route_server</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "amazon_side_asn",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>route_server</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the Route Server."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routeserver.html"><code>AWS::EC2::RouteServer</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>route_servers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AmazonSideAsn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>route_servers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>route_servers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>route_servers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>route_servers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>route_server</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.ec2.route_servers
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>route_servers</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.route_servers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -221,6 +275,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.route_servers
+SET data__PatchDocument = string('{{ {
+    "PersistRoutes": persist_routes,
+    "PersistRoutesDuration": persist_routes_duration,
+    "SnsNotificationsEnabled": sns_notifications_enabled,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/route_servers_list_only/index.md b/website/docs/services/ec2/route_servers_list_only/index.md
deleted file mode 100644
index ac04edf13..000000000
--- a/website/docs/services/ec2/route_servers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: route_servers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - route_servers_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>route_servers</code> in a region or regions, for all properties use <a href="/services/ec2/route_servers/"><code>route_servers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>route_servers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>VPC Route Server</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.route_servers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the Route Server."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>route_servers</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.route_servers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>route_servers_list_only</code> resource, see <a href="/services/ec2/route_servers/#permissions"><code>route_servers</code></a>
-
diff --git a/website/docs/services/ec2/route_tables/index.md b/website/docs/services/ec2/route_tables/index.md
index e4d517f65..b6c5e14f0 100644
--- a/website/docs/services/ec2/route_tables/index.md
+++ b/website/docs/services/ec2/route_tables/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>route_table</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "route_table_id",
@@ -67,6 +76,23 @@ Creates, updates, deletes or gets a <code>route_table</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "route_table_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routetable.html"><code>AWS::EC2::RouteTable</code></a>.
 
@@ -76,31 +102,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>route_tables</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>route_tables</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>route_tables</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>route_tables_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>route_tables</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -109,6 +141,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>route_table</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ tags
 FROM awscc.ec2.route_tables
 WHERE region = 'us-east-1' AND data__Identifier = '<RouteTableId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>route_tables</code> in a region.
+```sql
+SELECT
+region,
+route_table_id
+FROM awscc.ec2.route_tables_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -185,6 +239,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.route_tables
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RouteTableId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/route_tables_list_only/index.md b/website/docs/services/ec2/route_tables_list_only/index.md
deleted file mode 100644
index fd8e9eb97..000000000
--- a/website/docs/services/ec2/route_tables_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: route_tables_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - route_tables_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>route_tables</code> in a region or regions, for all properties use <a href="/services/ec2/route_tables/"><code>route_tables</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>route_tables_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a route table for the specified VPC. After you create a route table, you can add routes and associate the table with a subnet.<br />For more information, see &#91;Route tables&#93;(https://docs.aws.amazon.com/vpc/latest/userguide/VPC&#95;Route&#95;Tables.html) in the &#42;Amazon VPC User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.route_tables_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "route_table_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>route_tables</code> in a region.
-```sql
-SELECT
-region,
-route_table_id
-FROM awscc.ec2.route_tables_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>route_tables_list_only</code> resource, see <a href="/services/ec2/route_tables/#permissions"><code>route_tables</code></a>
-
diff --git a/website/docs/services/ec2/routes/index.md b/website/docs/services/ec2/routes/index.md
index 04cbc4295..fd4153973 100644
--- a/website/docs/services/ec2/routes/index.md
+++ b/website/docs/services/ec2/routes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>route</code> resource or lists <code>r
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "carrier_gateway_id",
@@ -120,6 +129,28 @@ Creates, updates, deletes or gets a <code>route</code> resource or lists <code>r
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cidr_block",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "route_table_id",
+    "type": "string",
+    "description": "The ID of the route table for the route."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html"><code>AWS::EC2::Route</code></a>.
 
@@ -129,31 +160,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>routes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RouteTableId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>routes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>routes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>routes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>routes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -162,6 +199,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>route</code>.
 ```sql
 SELECT
@@ -185,6 +231,20 @@ vpc_peering_connection_id
 FROM awscc.ec2.routes
 WHERE region = 'us-east-1' AND data__Identifier = '<RouteTableId>|<CidrBlock>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>routes</code> in a region.
+```sql
+SELECT
+region,
+route_table_id,
+cidr_block
+FROM awscc.ec2.routes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -301,6 +361,29 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.routes
+SET data__PatchDocument = string('{{ {
+    "CarrierGatewayId": carrier_gateway_id,
+    "CoreNetworkArn": core_network_arn,
+    "EgressOnlyInternetGatewayId": egress_only_internet_gateway_id,
+    "GatewayId": gateway_id,
+    "InstanceId": instance_id,
+    "LocalGatewayId": local_gateway_id,
+    "NatGatewayId": nat_gateway_id,
+    "NetworkInterfaceId": network_interface_id,
+    "TransitGatewayId": transit_gateway_id,
+    "VpcEndpointId": vpc_endpoint_id,
+    "VpcPeeringConnectionId": vpc_peering_connection_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RouteTableId>|<CidrBlock>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/routes_list_only/index.md b/website/docs/services/ec2/routes_list_only/index.md
deleted file mode 100644
index 994807e6e..000000000
--- a/website/docs/services/ec2/routes_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: routes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - routes_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>routes</code> in a region or regions, for all properties use <a href="/services/ec2/routes/"><code>routes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>routes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a route in a route table. For more information, see &#91;Routes&#93;(https://docs.aws.amazon.com/vpc/latest/userguide/VPC&#95;Route&#95;Tables.html#route-table-routes) in the &#42;Amazon VPC User Guide&#42;.<br />You must specify either a destination CIDR block or prefix list ID. You must also specify exactly one of the resources as the target.<br />If you create a route that references a transit gateway in the same template where you create the transit gateway, you must declare a dependency on the transit gateway attachment. The route table cannot use the transit gateway until it has successfully attached to the VPC. Add a &#91;DependsOn Attribute&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-dependson.html) in the &#96;&#96;AWS::EC2::Route&#96;&#96; resource to explicitly declare a dependency on the &#96;&#96;AWS::EC2::TransitGatewayAttachment&#96;&#96; resource.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.routes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cidr_block",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "route_table_id",
-    "type": "string",
-    "description": "The ID of the route table for the route."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>routes</code> in a region.
-```sql
-SELECT
-region,
-route_table_id,
-cidr_block
-FROM awscc.ec2.routes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>routes_list_only</code> resource, see <a href="/services/ec2/routes/#permissions"><code>routes</code></a>
-
diff --git a/website/docs/services/ec2/security_group_egresses/index.md b/website/docs/services/ec2/security_group_egresses/index.md
index 8fb9f0991..c51e14f01 100644
--- a/website/docs/services/ec2/security_group_egresses/index.md
+++ b/website/docs/services/ec2/security_group_egresses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>security_group_egress</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cidr_ip",
@@ -90,6 +99,23 @@ Creates, updates, deletes or gets a <code>security_group_egress</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-securitygroupegress.html"><code>AWS::EC2::SecurityGroupEgress</code></a>.
 
@@ -99,31 +125,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>security_group_egresses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IpProtocol, GroupId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>security_group_egresses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>security_group_egresses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>security_group_egresses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>security_group_egresses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -132,6 +164,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>security_group_egress</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ group_id
 FROM awscc.ec2.security_group_egresses
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>security_group_egresses</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.security_group_egresses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -243,6 +297,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.security_group_egresses
+SET data__PatchDocument = string('{{ {
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/security_group_egresses_list_only/index.md b/website/docs/services/ec2/security_group_egresses_list_only/index.md
deleted file mode 100644
index 6a4269bc4..000000000
--- a/website/docs/services/ec2/security_group_egresses_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: security_group_egresses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - security_group_egresses_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>security_group_egresses</code> in a region or regions, for all properties use <a href="/services/ec2/security_group_egresses/"><code>security_group_egresses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>security_group_egresses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Adds the specified outbound (egress) rule to a security group.<br />An outbound rule permits instances to send traffic to the specified IPv4 or IPv6 address range, the IP addresses that are specified by a prefix list, or the instances that are associated with a destination security group. For more information, see &#91;Security group rules&#93;(https://docs.aws.amazon.com/vpc/latest/userguide/security-group-rules.html).<br />You must specify exactly one of the following destinations: an IPv4 address range, an IPv6 address range, a prefix list, or a security group.<br />You must specify a protocol for each rule (for example, TCP). If the protocol is TCP or UDP, you must also specify a port or port range. If the protocol is ICMP or ICMPv6, you must also specify the ICMP/ICMPv6 type and code. To specify all types or all codes, use -1.<br />Rule changes are propagated to instances associated with the security group as quickly as possible. However, a small delay might occur.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.security_group_egresses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>security_group_egresses</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.security_group_egresses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>security_group_egresses_list_only</code> resource, see <a href="/services/ec2/security_group_egresses/#permissions"><code>security_group_egresses</code></a>
-
diff --git a/website/docs/services/ec2/security_group_ingresses/index.md b/website/docs/services/ec2/security_group_ingresses/index.md
index 67958c104..e7114c29a 100644
--- a/website/docs/services/ec2/security_group_ingresses/index.md
+++ b/website/docs/services/ec2/security_group_ingresses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>security_group_ingress</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -105,6 +114,23 @@ Creates, updates, deletes or gets a <code>security_group_ingress</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The Security Group Rule Id"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-securitygroupingress.html"><code>AWS::EC2::SecurityGroupIngress</code></a>.
 
@@ -114,31 +140,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>security_group_ingresses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IpProtocol, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>security_group_ingresses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>security_group_ingresses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>security_group_ingresses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>security_group_ingresses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -147,6 +179,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>security_group_ingress</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ to_port
 FROM awscc.ec2.security_group_ingresses
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>security_group_ingresses</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.security_group_ingresses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -271,6 +325,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.security_group_ingresses
+SET data__PatchDocument = string('{{ {
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/security_group_ingresses_list_only/index.md b/website/docs/services/ec2/security_group_ingresses_list_only/index.md
deleted file mode 100644
index cd87d6fd9..000000000
--- a/website/docs/services/ec2/security_group_ingresses_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: security_group_ingresses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - security_group_ingresses_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>security_group_ingresses</code> in a region or regions, for all properties use <a href="/services/ec2/security_group_ingresses/"><code>security_group_ingresses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>security_group_ingresses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::SecurityGroupIngress</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.security_group_ingresses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The Security Group Rule Id"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>security_group_ingresses</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.security_group_ingresses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>security_group_ingresses_list_only</code> resource, see <a href="/services/ec2/security_group_ingresses/#permissions"><code>security_group_ingresses</code></a>
-
diff --git a/website/docs/services/ec2/security_group_vpc_associations/index.md b/website/docs/services/ec2/security_group_vpc_associations/index.md
index 76c852402..547e7c5ee 100644
--- a/website/docs/services/ec2/security_group_vpc_associations/index.md
+++ b/website/docs/services/ec2/security_group_vpc_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>security_group_vpc_association</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "group_id",
@@ -65,6 +74,28 @@ Creates, updates, deletes or gets a <code>security_group_vpc_association</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "group_id",
+    "type": "string",
+    "description": "The group ID of the specified security group."
+  },
+  {
+    "name": "vpc_id",
+    "type": "string",
+    "description": "The ID of the VPC in the security group vpc association."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-securitygroupvpcassociation.html"><code>AWS::EC2::SecurityGroupVpcAssociation</code></a>.
 
@@ -74,26 +105,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>security_group_vpc_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GroupId, VpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>security_group_vpc_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>security_group_vpc_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>security_group_vpc_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +138,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>security_group_vpc_association</code>.
 ```sql
 SELECT
@@ -114,6 +159,20 @@ state_reason
 FROM awscc.ec2.security_group_vpc_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<GroupId>|<VpcId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>security_group_vpc_associations</code> in a region.
+```sql
+SELECT
+region,
+group_id,
+vpc_id
+FROM awscc.ec2.security_group_vpc_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -180,6 +239,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/security_group_vpc_associations_list_only/index.md b/website/docs/services/ec2/security_group_vpc_associations_list_only/index.md
deleted file mode 100644
index bfa1d04d7..000000000
--- a/website/docs/services/ec2/security_group_vpc_associations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: security_group_vpc_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - security_group_vpc_associations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>security_group_vpc_associations</code> in a region or regions, for all properties use <a href="/services/ec2/security_group_vpc_associations/"><code>security_group_vpc_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>security_group_vpc_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for the AWS::EC2::SecurityGroupVpcAssociation resource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.security_group_vpc_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "group_id",
-    "type": "string",
-    "description": "The group ID of the specified security group."
-  },
-  {
-    "name": "vpc_id",
-    "type": "string",
-    "description": "The ID of the VPC in the security group vpc association."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>security_group_vpc_associations</code> in a region.
-```sql
-SELECT
-region,
-group_id,
-vpc_id
-FROM awscc.ec2.security_group_vpc_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>security_group_vpc_associations_list_only</code> resource, see <a href="/services/ec2/security_group_vpc_associations/#permissions"><code>security_group_vpc_associations</code></a>
-
diff --git a/website/docs/services/ec2/security_groups/index.md b/website/docs/services/ec2/security_groups/index.md
index 331f1392a..2fb1a2fa2 100644
--- a/website/docs/services/ec2/security_groups/index.md
+++ b/website/docs/services/ec2/security_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>security_group</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "group_description",
@@ -186,6 +195,23 @@ Creates, updates, deletes or gets a <code>security_group</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The group name or group ID depending on whether the SG is created in default or specific VPC"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-securitygroup.html"><code>AWS::EC2::SecurityGroup</code></a>.
 
@@ -195,31 +221,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>security_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GroupDescription, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>security_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>security_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>security_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>security_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -228,6 +260,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>security_group</code>.
 ```sql
 SELECT
@@ -243,6 +284,19 @@ group_id
 FROM awscc.ec2.security_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>security_groups</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.security_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -343,6 +397,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.security_groups
+SET data__PatchDocument = string('{{ {
+    "SecurityGroupIngress": security_group_ingress,
+    "SecurityGroupEgress": security_group_egress,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/security_groups_list_only/index.md b/website/docs/services/ec2/security_groups_list_only/index.md
deleted file mode 100644
index 1a5cbc780..000000000
--- a/website/docs/services/ec2/security_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: security_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - security_groups_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>security_groups</code> in a region or regions, for all properties use <a href="/services/ec2/security_groups/"><code>security_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>security_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::SecurityGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.security_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The group name or group ID depending on whether the SG is created in default or specific VPC"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>security_groups</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.security_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>security_groups_list_only</code> resource, see <a href="/services/ec2/security_groups/#permissions"><code>security_groups</code></a>
-
diff --git a/website/docs/services/ec2/snapshot_block_public_accesses/index.md b/website/docs/services/ec2/snapshot_block_public_accesses/index.md
index c2a071cce..b6bce61c2 100644
--- a/website/docs/services/ec2/snapshot_block_public_accesses/index.md
+++ b/website/docs/services/ec2/snapshot_block_public_accesses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>snapshot_block_public_access</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "state",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>snapshot_block_public_access</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "account_id",
+    "type": "string",
+    "description": "The identifier for the specified AWS account."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-snapshotblockpublicaccess.html"><code>AWS::EC2::SnapshotBlockPublicAccess</code></a>.
 
@@ -59,31 +85,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>snapshot_block_public_accesses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="State, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>snapshot_block_public_accesses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>snapshot_block_public_accesses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>snapshot_block_public_accesses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>snapshot_block_public_accesses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +124,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>snapshot_block_public_access</code>.
 ```sql
 SELECT
@@ -101,6 +142,19 @@ account_id
 FROM awscc.ec2.snapshot_block_public_accesses
 WHERE region = 'us-east-1' AND data__Identifier = '<AccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>snapshot_block_public_accesses</code> in a region.
+```sql
+SELECT
+region,
+account_id
+FROM awscc.ec2.snapshot_block_public_accesses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -161,6 +215,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.snapshot_block_public_accesses
+SET data__PatchDocument = string('{{ {
+    "State": state
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/snapshot_block_public_accesses_list_only/index.md b/website/docs/services/ec2/snapshot_block_public_accesses_list_only/index.md
deleted file mode 100644
index ed3708d4c..000000000
--- a/website/docs/services/ec2/snapshot_block_public_accesses_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: snapshot_block_public_accesses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - snapshot_block_public_accesses_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>snapshot_block_public_accesses</code> in a region or regions, for all properties use <a href="/services/ec2/snapshot_block_public_accesses/"><code>snapshot_block_public_accesses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>snapshot_block_public_accesses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::SnapshotBlockPublicAccess</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.snapshot_block_public_accesses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "account_id",
-    "type": "string",
-    "description": "The identifier for the specified AWS account."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>snapshot_block_public_accesses</code> in a region.
-```sql
-SELECT
-region,
-account_id
-FROM awscc.ec2.snapshot_block_public_accesses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>snapshot_block_public_accesses_list_only</code> resource, see <a href="/services/ec2/snapshot_block_public_accesses/#permissions"><code>snapshot_block_public_accesses</code></a>
-
diff --git a/website/docs/services/ec2/spot_fleets/index.md b/website/docs/services/ec2/spot_fleets/index.md
index 99b2229ba..ebbf535ce 100644
--- a/website/docs/services/ec2/spot_fleets/index.md
+++ b/website/docs/services/ec2/spot_fleets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>spot_fleet</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -650,6 +659,23 @@ Creates, updates, deletes or gets a <code>spot_fleet</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-spotfleet.html"><code>AWS::EC2::SpotFleet</code></a>.
 
@@ -659,31 +685,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>spot_fleets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SpotFleetRequestConfigData, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>spot_fleets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>spot_fleets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>spot_fleets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>spot_fleets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -692,6 +724,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>spot_fleet</code>.
 ```sql
 SELECT
@@ -701,6 +742,19 @@ spot_fleet_request_config_data
 FROM awscc.ec2.spot_fleets
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>spot_fleets</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.spot_fleets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -913,6 +967,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/spot_fleets_list_only/index.md b/website/docs/services/ec2/spot_fleets_list_only/index.md
deleted file mode 100644
index 506564087..000000000
--- a/website/docs/services/ec2/spot_fleets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: spot_fleets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - spot_fleets_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>spot_fleets</code> in a region or regions, for all properties use <a href="/services/ec2/spot_fleets/"><code>spot_fleets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>spot_fleets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::SpotFleet</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.spot_fleets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>spot_fleets</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.spot_fleets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>spot_fleets_list_only</code> resource, see <a href="/services/ec2/spot_fleets/#permissions"><code>spot_fleets</code></a>
-
diff --git a/website/docs/services/ec2/subnet_cidr_blocks/index.md b/website/docs/services/ec2/subnet_cidr_blocks/index.md
index e806ad933..e84be66bf 100644
--- a/website/docs/services/ec2/subnet_cidr_blocks/index.md
+++ b/website/docs/services/ec2/subnet_cidr_blocks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>subnet_cidr_block</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -75,6 +84,23 @@ Creates, updates, deletes or gets a <code>subnet_cidr_block</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Information about the IPv6 association."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetcidrblock.html"><code>AWS::EC2::SubnetCidrBlock</code></a>.
 
@@ -84,26 +110,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>subnet_cidr_blocks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SubnetId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>subnet_cidr_blocks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>subnet_cidr_blocks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>subnet_cidr_blocks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +143,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>subnet_cidr_block</code>.
 ```sql
 SELECT
@@ -126,6 +166,19 @@ ip_source
 FROM awscc.ec2.subnet_cidr_blocks
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>subnet_cidr_blocks</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.subnet_cidr_blocks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -198,6 +251,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/subnet_cidr_blocks_list_only/index.md b/website/docs/services/ec2/subnet_cidr_blocks_list_only/index.md
deleted file mode 100644
index d294584ac..000000000
--- a/website/docs/services/ec2/subnet_cidr_blocks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: subnet_cidr_blocks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - subnet_cidr_blocks_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>subnet_cidr_blocks</code> in a region or regions, for all properties use <a href="/services/ec2/subnet_cidr_blocks/"><code>subnet_cidr_blocks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>subnet_cidr_blocks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::EC2::SubnetCidrBlock resource creates association between subnet and IPv6 CIDR</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.subnet_cidr_blocks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Information about the IPv6 association."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>subnet_cidr_blocks</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.subnet_cidr_blocks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>subnet_cidr_blocks_list_only</code> resource, see <a href="/services/ec2/subnet_cidr_blocks/#permissions"><code>subnet_cidr_blocks</code></a>
-
diff --git a/website/docs/services/ec2/subnet_network_acl_associations/index.md b/website/docs/services/ec2/subnet_network_acl_associations/index.md
index 2037b4cc1..10855bc8b 100644
--- a/website/docs/services/ec2/subnet_network_acl_associations/index.md
+++ b/website/docs/services/ec2/subnet_network_acl_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>subnet_network_acl_association</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "subnet_id",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets a <code>subnet_network_acl_association</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "association_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetnetworkaclassociation.html"><code>AWS::EC2::SubnetNetworkAclAssociation</code></a>.
 
@@ -64,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>subnet_network_acl_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="NetworkAclId, SubnetId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>subnet_network_acl_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>subnet_network_acl_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>subnet_network_acl_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>subnet_network_acl_association</code>.
 ```sql
 SELECT
@@ -102,6 +142,19 @@ association_id
 FROM awscc.ec2.subnet_network_acl_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<AssociationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>subnet_network_acl_associations</code> in a region.
+```sql
+SELECT
+region,
+association_id
+FROM awscc.ec2.subnet_network_acl_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -168,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/subnet_network_acl_associations_list_only/index.md b/website/docs/services/ec2/subnet_network_acl_associations_list_only/index.md
deleted file mode 100644
index a61409695..000000000
--- a/website/docs/services/ec2/subnet_network_acl_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: subnet_network_acl_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - subnet_network_acl_associations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>subnet_network_acl_associations</code> in a region or regions, for all properties use <a href="/services/ec2/subnet_network_acl_associations/"><code>subnet_network_acl_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>subnet_network_acl_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::SubnetNetworkAclAssociation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.subnet_network_acl_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "association_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>subnet_network_acl_associations</code> in a region.
-```sql
-SELECT
-region,
-association_id
-FROM awscc.ec2.subnet_network_acl_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>subnet_network_acl_associations_list_only</code> resource, see <a href="/services/ec2/subnet_network_acl_associations/#permissions"><code>subnet_network_acl_associations</code></a>
-
diff --git a/website/docs/services/ec2/subnet_route_table_associations/index.md b/website/docs/services/ec2/subnet_route_table_associations/index.md
index f0b77407c..ed2277819 100644
--- a/website/docs/services/ec2/subnet_route_table_associations/index.md
+++ b/website/docs/services/ec2/subnet_route_table_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>subnet_route_table_association</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "route_table_id",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets a <code>subnet_route_table_association</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetroutetableassociation.html"><code>AWS::EC2::SubnetRouteTableAssociation</code></a>.
 
@@ -64,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>subnet_route_table_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RouteTableId, SubnetId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>subnet_route_table_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>subnet_route_table_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>subnet_route_table_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>subnet_route_table_association</code>.
 ```sql
 SELECT
@@ -102,6 +142,19 @@ subnet_id
 FROM awscc.ec2.subnet_route_table_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>subnet_route_table_associations</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.subnet_route_table_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -168,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/subnet_route_table_associations_list_only/index.md b/website/docs/services/ec2/subnet_route_table_associations_list_only/index.md
deleted file mode 100644
index 8568f96dd..000000000
--- a/website/docs/services/ec2/subnet_route_table_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: subnet_route_table_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - subnet_route_table_associations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>subnet_route_table_associations</code> in a region or regions, for all properties use <a href="/services/ec2/subnet_route_table_associations/"><code>subnet_route_table_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>subnet_route_table_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Associates a subnet with a route table. The subnet and route table must be in the same VPC. This association causes traffic originating from the subnet to be routed according to the routes in the route table. A route table can be associated with multiple subnets. To create a route table, see &#91;AWS::EC2::RouteTable&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routetable.html).</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.subnet_route_table_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>subnet_route_table_associations</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.subnet_route_table_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>subnet_route_table_associations_list_only</code> resource, see <a href="/services/ec2/subnet_route_table_associations/#permissions"><code>subnet_route_table_associations</code></a>
-
diff --git a/website/docs/services/ec2/subnets/index.md b/website/docs/services/ec2/subnets/index.md
index e611ac70e..45c762d6b 100644
--- a/website/docs/services/ec2/subnets/index.md
+++ b/website/docs/services/ec2/subnets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>subnet</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "assign_ipv6_address_on_creation",
@@ -181,6 +190,23 @@ Creates, updates, deletes or gets a <code>subnet</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "subnet_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html"><code>AWS::EC2::Subnet</code></a>.
 
@@ -190,31 +216,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>subnets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>subnets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>subnets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>subnets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>subnets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -223,6 +255,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>subnet</code>.
 ```sql
 SELECT
@@ -251,6 +292,19 @@ block_public_access_states
 FROM awscc.ec2.subnets
 WHERE region = 'us-east-1' AND data__Identifier = '<SubnetId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>subnets</code> in a region.
+```sql
+SELECT
+region,
+subnet_id
+FROM awscc.ec2.subnets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -380,6 +434,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.subnets
+SET data__PatchDocument = string('{{ {
+    "AssignIpv6AddressOnCreation": assign_ipv6_address_on_creation,
+    "MapPublicIpOnLaunch": map_public_ip_on_launch,
+    "EnableLniAtDeviceIndex": enable_lni_at_device_index,
+    "Ipv6CidrBlock": ipv6_cidr_block,
+    "EnableDns64": enable_dns64,
+    "PrivateDnsNameOptionsOnLaunch": private_dns_name_options_on_launch,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SubnetId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/subnets_list_only/index.md b/website/docs/services/ec2/subnets_list_only/index.md
deleted file mode 100644
index 706e9eddf..000000000
--- a/website/docs/services/ec2/subnets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: subnets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - subnets_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>subnets</code> in a region or regions, for all properties use <a href="/services/ec2/subnets/"><code>subnets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>subnets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a subnet for the specified VPC.<br />For an IPv4 only subnet, specify an IPv4 CIDR block. If the VPC has an IPv6 CIDR block, you can create an IPv6 only subnet or a dual stack subnet instead. For an IPv6 only subnet, specify an IPv6 CIDR block. For a dual stack subnet, specify both an IPv4 CIDR block and an IPv6 CIDR block.<br />For more information, see &#91;Subnets for your VPC&#93;(https://docs.aws.amazon.com/vpc/latest/userguide/configure-subnets.html) in the &#42;Amazon VPC User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.subnets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "subnet_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>subnets</code> in a region.
-```sql
-SELECT
-region,
-subnet_id
-FROM awscc.ec2.subnets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>subnets_list_only</code> resource, see <a href="/services/ec2/subnets/#permissions"><code>subnets</code></a>
-
diff --git a/website/docs/services/ec2/traffic_mirror_filter_rules/index.md b/website/docs/services/ec2/traffic_mirror_filter_rules/index.md
index 05cee03c2..c18f0a61e 100644
--- a/website/docs/services/ec2/traffic_mirror_filter_rules/index.md
+++ b/website/docs/services/ec2/traffic_mirror_filter_rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>traffic_mirror_filter_rule</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "destination_port_range",
@@ -119,6 +128,23 @@ Creates, updates, deletes or gets a <code>traffic_mirror_filter_rule</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "traffic_mirror_filter_rule_id",
+    "type": "string",
+    "description": "The ID of the Traffic Mirror Filter rule."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilterrule.html"><code>AWS::EC2::TrafficMirrorFilterRule</code></a>.
 
@@ -128,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>traffic_mirror_filter_rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RuleAction, SourceCidrBlock, RuleNumber, DestinationCidrBlock, TrafficMirrorFilterId, TrafficDirection, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>traffic_mirror_filter_rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>traffic_mirror_filter_rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>traffic_mirror_filter_rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>traffic_mirror_filter_rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>traffic_mirror_filter_rule</code>.
 ```sql
 SELECT
@@ -180,6 +221,19 @@ tags
 FROM awscc.ec2.traffic_mirror_filter_rules
 WHERE region = 'us-east-1' AND data__Identifier = '<TrafficMirrorFilterRuleId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>traffic_mirror_filter_rules</code> in a region.
+```sql
+SELECT
+region,
+traffic_mirror_filter_rule_id
+FROM awscc.ec2.traffic_mirror_filter_rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -294,6 +348,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.traffic_mirror_filter_rules
+SET data__PatchDocument = string('{{ {
+    "DestinationPortRange": destination_port_range,
+    "Description": description,
+    "SourcePortRange": source_port_range,
+    "RuleAction": rule_action,
+    "SourceCidrBlock": source_cidr_block,
+    "RuleNumber": rule_number,
+    "DestinationCidrBlock": destination_cidr_block,
+    "TrafficDirection": traffic_direction,
+    "Protocol": protocol,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TrafficMirrorFilterRuleId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/traffic_mirror_filter_rules_list_only/index.md b/website/docs/services/ec2/traffic_mirror_filter_rules_list_only/index.md
deleted file mode 100644
index 2cf6f68be..000000000
--- a/website/docs/services/ec2/traffic_mirror_filter_rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: traffic_mirror_filter_rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - traffic_mirror_filter_rules_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>traffic_mirror_filter_rules</code> in a region or regions, for all properties use <a href="/services/ec2/traffic_mirror_filter_rules/"><code>traffic_mirror_filter_rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>traffic_mirror_filter_rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for for AWS::EC2::TrafficMirrorFilterRule</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.traffic_mirror_filter_rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "traffic_mirror_filter_rule_id",
-    "type": "string",
-    "description": "The ID of the Traffic Mirror Filter rule."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>traffic_mirror_filter_rules</code> in a region.
-```sql
-SELECT
-region,
-traffic_mirror_filter_rule_id
-FROM awscc.ec2.traffic_mirror_filter_rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>traffic_mirror_filter_rules_list_only</code> resource, see <a href="/services/ec2/traffic_mirror_filter_rules/#permissions"><code>traffic_mirror_filter_rules</code></a>
-
diff --git a/website/docs/services/ec2/traffic_mirror_filters/index.md b/website/docs/services/ec2/traffic_mirror_filters/index.md
index 55d5ed94d..0ea8d401b 100644
--- a/website/docs/services/ec2/traffic_mirror_filters/index.md
+++ b/website/docs/services/ec2/traffic_mirror_filters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>traffic_mirror_filter</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>traffic_mirror_filter</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of a traffic mirror filter."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilter.html"><code>AWS::EC2::TrafficMirrorFilter</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>traffic_mirror_filters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>traffic_mirror_filters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>traffic_mirror_filters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>traffic_mirror_filters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>traffic_mirror_filters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>traffic_mirror_filter</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ tags
 FROM awscc.ec2.traffic_mirror_filters
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>traffic_mirror_filters</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.traffic_mirror_filters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -200,6 +254,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.traffic_mirror_filters
+SET data__PatchDocument = string('{{ {
+    "NetworkServices": network_services,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/traffic_mirror_filters_list_only/index.md b/website/docs/services/ec2/traffic_mirror_filters_list_only/index.md
deleted file mode 100644
index 1786f2059..000000000
--- a/website/docs/services/ec2/traffic_mirror_filters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: traffic_mirror_filters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - traffic_mirror_filters_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>traffic_mirror_filters</code> in a region or regions, for all properties use <a href="/services/ec2/traffic_mirror_filters/"><code>traffic_mirror_filters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>traffic_mirror_filters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::EC2::TrafficMirrorFilter</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.traffic_mirror_filters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of a traffic mirror filter."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>traffic_mirror_filters</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.traffic_mirror_filters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>traffic_mirror_filters_list_only</code> resource, see <a href="/services/ec2/traffic_mirror_filters/#permissions"><code>traffic_mirror_filters</code></a>
-
diff --git a/website/docs/services/ec2/traffic_mirror_sessions/index.md b/website/docs/services/ec2/traffic_mirror_sessions/index.md
index db8e8ed2f..a11e0a9da 100644
--- a/website/docs/services/ec2/traffic_mirror_sessions/index.md
+++ b/website/docs/services/ec2/traffic_mirror_sessions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>traffic_mirror_session</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets a <code>traffic_mirror_session</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of a Traffic Mirror session."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorsession.html"><code>AWS::EC2::TrafficMirrorSession</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>traffic_mirror_sessions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="NetworkInterfaceId, TrafficMirrorFilterId, SessionNumber, TrafficMirrorTargetId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>traffic_mirror_sessions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>traffic_mirror_sessions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>traffic_mirror_sessions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>traffic_mirror_sessions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>traffic_mirror_session</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ tags
 FROM awscc.ec2.traffic_mirror_sessions
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>traffic_mirror_sessions</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.traffic_mirror_sessions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -261,6 +315,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.traffic_mirror_sessions
+SET data__PatchDocument = string('{{ {
+    "NetworkInterfaceId": network_interface_id,
+    "TrafficMirrorTargetId": traffic_mirror_target_id,
+    "TrafficMirrorFilterId": traffic_mirror_filter_id,
+    "PacketLength": packet_length,
+    "SessionNumber": session_number,
+    "VirtualNetworkId": virtual_network_id,
+    "Description": description,
+    "OwnerId": owner_id,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/traffic_mirror_sessions_list_only/index.md b/website/docs/services/ec2/traffic_mirror_sessions_list_only/index.md
deleted file mode 100644
index 75c957740..000000000
--- a/website/docs/services/ec2/traffic_mirror_sessions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: traffic_mirror_sessions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - traffic_mirror_sessions_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>traffic_mirror_sessions</code> in a region or regions, for all properties use <a href="/services/ec2/traffic_mirror_sessions/"><code>traffic_mirror_sessions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>traffic_mirror_sessions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::EC2::TrafficMirrorSession</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.traffic_mirror_sessions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of a Traffic Mirror session."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>traffic_mirror_sessions</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.traffic_mirror_sessions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>traffic_mirror_sessions_list_only</code> resource, see <a href="/services/ec2/traffic_mirror_sessions/#permissions"><code>traffic_mirror_sessions</code></a>
-
diff --git a/website/docs/services/ec2/traffic_mirror_targets/index.md b/website/docs/services/ec2/traffic_mirror_targets/index.md
index 9261f9cb7..2f13c1718 100644
--- a/website/docs/services/ec2/traffic_mirror_targets/index.md
+++ b/website/docs/services/ec2/traffic_mirror_targets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>traffic_mirror_target</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "network_load_balancer_arn",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>traffic_mirror_target</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrortarget.html"><code>AWS::EC2::TrafficMirrorTarget</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>traffic_mirror_targets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>traffic_mirror_targets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>traffic_mirror_targets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>traffic_mirror_targets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>traffic_mirror_targets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>traffic_mirror_target</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.ec2.traffic_mirror_targets
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>traffic_mirror_targets</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.traffic_mirror_targets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -223,6 +277,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.traffic_mirror_targets
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/traffic_mirror_targets_list_only/index.md b/website/docs/services/ec2/traffic_mirror_targets_list_only/index.md
deleted file mode 100644
index 20a029682..000000000
--- a/website/docs/services/ec2/traffic_mirror_targets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: traffic_mirror_targets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - traffic_mirror_targets_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>traffic_mirror_targets</code> in a region or regions, for all properties use <a href="/services/ec2/traffic_mirror_targets/"><code>traffic_mirror_targets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>traffic_mirror_targets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The description of the Traffic Mirror target.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.traffic_mirror_targets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>traffic_mirror_targets</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.traffic_mirror_targets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>traffic_mirror_targets_list_only</code> resource, see <a href="/services/ec2/traffic_mirror_targets/#permissions"><code>traffic_mirror_targets</code></a>
-
diff --git a/website/docs/services/ec2/transit_gateway_attachments/index.md b/website/docs/services/ec2/transit_gateway_attachments/index.md
index af4238765..64e1b812c 100644
--- a/website/docs/services/ec2/transit_gateway_attachments/index.md
+++ b/website/docs/services/ec2/transit_gateway_attachments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transit_gateway_attachment</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "options",
@@ -104,6 +113,23 @@ Creates, updates, deletes or gets a <code>transit_gateway_attachment</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayattachment.html"><code>AWS::EC2::TransitGatewayAttachment</code></a>.
 
@@ -113,31 +139,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_attachments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VpcId, SubnetIds, TransitGatewayId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_attachments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>transit_gateway_attachments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_attachments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_attachments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -146,6 +178,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_attachment</code>.
 ```sql
 SELECT
@@ -159,6 +200,19 @@ tags
 FROM awscc.ec2.transit_gateway_attachments
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_attachments</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.transit_gateway_attachments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -246,6 +300,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.transit_gateway_attachments
+SET data__PatchDocument = string('{{ {
+    "Options": options,
+    "SubnetIds": subnet_ids,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/transit_gateway_attachments_list_only/index.md b/website/docs/services/ec2/transit_gateway_attachments_list_only/index.md
deleted file mode 100644
index 80a9e184a..000000000
--- a/website/docs/services/ec2/transit_gateway_attachments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: transit_gateway_attachments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_attachments_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_attachments</code> in a region or regions, for all properties use <a href="/services/ec2/transit_gateway_attachments/"><code>transit_gateway_attachments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_attachments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::TransitGatewayAttachment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.transit_gateway_attachments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_attachments</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.transit_gateway_attachments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_attachments_list_only</code> resource, see <a href="/services/ec2/transit_gateway_attachments/#permissions"><code>transit_gateway_attachments</code></a>
-
diff --git a/website/docs/services/ec2/transit_gateway_connect_peers/index.md b/website/docs/services/ec2/transit_gateway_connect_peers/index.md
index 5a985b6ea..624db3a41 100644
--- a/website/docs/services/ec2/transit_gateway_connect_peers/index.md
+++ b/website/docs/services/ec2/transit_gateway_connect_peers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transit_gateway_connect_peer</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "transit_gateway_attachment_id",
@@ -136,6 +145,23 @@ Creates, updates, deletes or gets a <code>transit_gateway_connect_peer</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "transit_gateway_connect_peer_id",
+    "type": "string",
+    "description": "The ID of the Connect peer."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayconnectpeer.html"><code>AWS::EC2::TransitGatewayConnectPeer</code></a>.
 
@@ -145,31 +171,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_connect_peers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TransitGatewayAttachmentId, ConnectPeerConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_connect_peers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>transit_gateway_connect_peers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_connect_peers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_connect_peers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -178,6 +210,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_connect_peer</code>.
 ```sql
 SELECT
@@ -191,6 +232,19 @@ tags
 FROM awscc.ec2.transit_gateway_connect_peers
 WHERE region = 'us-east-1' AND data__Identifier = '<TransitGatewayConnectPeerId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_connect_peers</code> in a region.
+```sql
+SELECT
+region,
+transit_gateway_connect_peer_id
+FROM awscc.ec2.transit_gateway_connect_peers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -274,6 +328,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.transit_gateway_connect_peers
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TransitGatewayConnectPeerId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/transit_gateway_connect_peers_list_only/index.md b/website/docs/services/ec2/transit_gateway_connect_peers_list_only/index.md
deleted file mode 100644
index 7df5794fa..000000000
--- a/website/docs/services/ec2/transit_gateway_connect_peers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: transit_gateway_connect_peers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_connect_peers_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_connect_peers</code> in a region or regions, for all properties use <a href="/services/ec2/transit_gateway_connect_peers/"><code>transit_gateway_connect_peers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_connect_peers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::TransitGatewayConnectPeer</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.transit_gateway_connect_peers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "transit_gateway_connect_peer_id",
-    "type": "string",
-    "description": "The ID of the Connect peer."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_connect_peers</code> in a region.
-```sql
-SELECT
-region,
-transit_gateway_connect_peer_id
-FROM awscc.ec2.transit_gateway_connect_peers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_connect_peers_list_only</code> resource, see <a href="/services/ec2/transit_gateway_connect_peers/#permissions"><code>transit_gateway_connect_peers</code></a>
-
diff --git a/website/docs/services/ec2/transit_gateway_connects/index.md b/website/docs/services/ec2/transit_gateway_connects/index.md
index e4eb2232d..4b20ad76d 100644
--- a/website/docs/services/ec2/transit_gateway_connects/index.md
+++ b/website/docs/services/ec2/transit_gateway_connects/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transit_gateway_connect</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "transit_gateway_attachment_id",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets a <code>transit_gateway_connect</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "transit_gateway_attachment_id",
+    "type": "string",
+    "description": "The ID of the Connect attachment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayconnect.html"><code>AWS::EC2::TransitGatewayConnect</code></a>.
 
@@ -103,31 +129,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_connects</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TransportTransitGatewayAttachmentId, Options, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_connects</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>transit_gateway_connects</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_connects_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_connects</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_connect</code>.
 ```sql
 SELECT
@@ -150,6 +191,19 @@ options
 FROM awscc.ec2.transit_gateway_connects
 WHERE region = 'us-east-1' AND data__Identifier = '<TransitGatewayAttachmentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_connects</code> in a region.
+```sql
+SELECT
+region,
+transit_gateway_attachment_id
+FROM awscc.ec2.transit_gateway_connects_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -223,6 +277,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.transit_gateway_connects
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TransitGatewayAttachmentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/transit_gateway_connects_list_only/index.md b/website/docs/services/ec2/transit_gateway_connects_list_only/index.md
deleted file mode 100644
index 1ff981c28..000000000
--- a/website/docs/services/ec2/transit_gateway_connects_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: transit_gateway_connects_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_connects_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_connects</code> in a region or regions, for all properties use <a href="/services/ec2/transit_gateway_connects/"><code>transit_gateway_connects</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_connects_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::EC2::TransitGatewayConnect type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.transit_gateway_connects_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "transit_gateway_attachment_id",
-    "type": "string",
-    "description": "The ID of the Connect attachment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_connects</code> in a region.
-```sql
-SELECT
-region,
-transit_gateway_attachment_id
-FROM awscc.ec2.transit_gateway_connects_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_connects_list_only</code> resource, see <a href="/services/ec2/transit_gateway_connects/#permissions"><code>transit_gateway_connects</code></a>
-
diff --git a/website/docs/services/ec2/transit_gateway_multicast_domain_associations/index.md b/website/docs/services/ec2/transit_gateway_multicast_domain_associations/index.md
index f54b0f676..2076d4d89 100644
--- a/website/docs/services/ec2/transit_gateway_multicast_domain_associations/index.md
+++ b/website/docs/services/ec2/transit_gateway_multicast_domain_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transit_gateway_multicast_domain_assoc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "transit_gateway_multicast_domain_id",
@@ -70,6 +79,33 @@ Creates, updates, deletes or gets a <code>transit_gateway_multicast_domain_assoc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "transit_gateway_multicast_domain_id",
+    "type": "string",
+    "description": "The ID of the transit gateway multicast domain."
+  },
+  {
+    "name": "transit_gateway_attachment_id",
+    "type": "string",
+    "description": "The ID of the transit gateway attachment."
+  },
+  {
+    "name": "subnet_id",
+    "type": "string",
+    "description": "The IDs of the subnets to associate with the transit gateway multicast domain."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastdomainassociation.html"><code>AWS::EC2::TransitGatewayMulticastDomainAssociation</code></a>.
 
@@ -79,26 +115,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_multicast_domain_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TransitGatewayMulticastDomainId, TransitGatewayAttachmentId, SubnetId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_multicast_domain_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_multicast_domain_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_multicast_domain_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +148,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_multicast_domain_association</code>.
 ```sql
 SELECT
@@ -120,6 +170,21 @@ subnet_id
 FROM awscc.ec2.transit_gateway_multicast_domain_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<TransitGatewayMulticastDomainId>|<TransitGatewayAttachmentId>|<SubnetId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_multicast_domain_associations</code> in a region.
+```sql
+SELECT
+region,
+transit_gateway_multicast_domain_id,
+transit_gateway_attachment_id,
+subnet_id
+FROM awscc.ec2.transit_gateway_multicast_domain_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -192,6 +257,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/transit_gateway_multicast_domain_associations_list_only/index.md b/website/docs/services/ec2/transit_gateway_multicast_domain_associations_list_only/index.md
deleted file mode 100644
index 6919d0bb0..000000000
--- a/website/docs/services/ec2/transit_gateway_multicast_domain_associations_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: transit_gateway_multicast_domain_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_multicast_domain_associations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_multicast_domain_associations</code> in a region or regions, for all properties use <a href="/services/ec2/transit_gateway_multicast_domain_associations/"><code>transit_gateway_multicast_domain_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_multicast_domain_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::EC2::TransitGatewayMulticastDomainAssociation type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.transit_gateway_multicast_domain_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "transit_gateway_multicast_domain_id",
-    "type": "string",
-    "description": "The ID of the transit gateway multicast domain."
-  },
-  {
-    "name": "transit_gateway_attachment_id",
-    "type": "string",
-    "description": "The ID of the transit gateway attachment."
-  },
-  {
-    "name": "subnet_id",
-    "type": "string",
-    "description": "The IDs of the subnets to associate with the transit gateway multicast domain."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_multicast_domain_associations</code> in a region.
-```sql
-SELECT
-region,
-transit_gateway_multicast_domain_id,
-transit_gateway_attachment_id,
-subnet_id
-FROM awscc.ec2.transit_gateway_multicast_domain_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_multicast_domain_associations_list_only</code> resource, see <a href="/services/ec2/transit_gateway_multicast_domain_associations/#permissions"><code>transit_gateway_multicast_domain_associations</code></a>
-
diff --git a/website/docs/services/ec2/transit_gateway_multicast_domains/index.md b/website/docs/services/ec2/transit_gateway_multicast_domains/index.md
index 1625defe0..f892c8155 100644
--- a/website/docs/services/ec2/transit_gateway_multicast_domains/index.md
+++ b/website/docs/services/ec2/transit_gateway_multicast_domains/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transit_gateway_multicast_domain</code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "transit_gateway_multicast_domain_id",
@@ -104,6 +113,23 @@ Creates, updates, deletes or gets a <code>transit_gateway_multicast_domain</code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "transit_gateway_multicast_domain_id",
+    "type": "string",
+    "description": "The ID of the transit gateway multicast domain."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastdomain.html"><code>AWS::EC2::TransitGatewayMulticastDomain</code></a>.
 
@@ -113,31 +139,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_multicast_domains</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TransitGatewayId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_multicast_domains</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>transit_gateway_multicast_domains</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_multicast_domains_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_multicast_domains</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -146,6 +178,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_multicast_domain</code>.
 ```sql
 SELECT
@@ -160,6 +201,19 @@ options
 FROM awscc.ec2.transit_gateway_multicast_domains
 WHERE region = 'us-east-1' AND data__Identifier = '<TransitGatewayMulticastDomainId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_multicast_domains</code> in a region.
+```sql
+SELECT
+region,
+transit_gateway_multicast_domain_id
+FROM awscc.ec2.transit_gateway_multicast_domains_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -233,6 +287,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.transit_gateway_multicast_domains
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Options": options
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TransitGatewayMulticastDomainId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/transit_gateway_multicast_domains_list_only/index.md b/website/docs/services/ec2/transit_gateway_multicast_domains_list_only/index.md
deleted file mode 100644
index 91da6d4ad..000000000
--- a/website/docs/services/ec2/transit_gateway_multicast_domains_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: transit_gateway_multicast_domains_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_multicast_domains_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_multicast_domains</code> in a region or regions, for all properties use <a href="/services/ec2/transit_gateway_multicast_domains/"><code>transit_gateway_multicast_domains</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_multicast_domains_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::EC2::TransitGatewayMulticastDomain type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.transit_gateway_multicast_domains_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "transit_gateway_multicast_domain_id",
-    "type": "string",
-    "description": "The ID of the transit gateway multicast domain."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_multicast_domains</code> in a region.
-```sql
-SELECT
-region,
-transit_gateway_multicast_domain_id
-FROM awscc.ec2.transit_gateway_multicast_domains_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_multicast_domains_list_only</code> resource, see <a href="/services/ec2/transit_gateway_multicast_domains/#permissions"><code>transit_gateway_multicast_domains</code></a>
-
diff --git a/website/docs/services/ec2/transit_gateway_multicast_group_members/index.md b/website/docs/services/ec2/transit_gateway_multicast_group_members/index.md
index d6f666fa8..138dda49e 100644
--- a/website/docs/services/ec2/transit_gateway_multicast_group_members/index.md
+++ b/website/docs/services/ec2/transit_gateway_multicast_group_members/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transit_gateway_multicast_group_member
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "group_ip_address",
@@ -90,6 +99,33 @@ Creates, updates, deletes or gets a <code>transit_gateway_multicast_group_member
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "group_ip_address",
+    "type": "string",
+    "description": "The IP address assigned to the transit gateway multicast group."
+  },
+  {
+    "name": "transit_gateway_multicast_domain_id",
+    "type": "string",
+    "description": "The ID of the transit gateway multicast domain."
+  },
+  {
+    "name": "network_interface_id",
+    "type": "string",
+    "description": "The ID of the transit gateway attachment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastgroupmember.html"><code>AWS::EC2::TransitGatewayMulticastGroupMember</code></a>.
 
@@ -99,26 +135,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_multicast_group_members</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GroupIpAddress, NetworkInterfaceId, TransitGatewayMulticastDomainId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_multicast_group_members</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_multicast_group_members_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_multicast_group_members</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -127,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_multicast_group_member</code>.
 ```sql
 SELECT
@@ -144,6 +194,21 @@ member_type
 FROM awscc.ec2.transit_gateway_multicast_group_members
 WHERE region = 'us-east-1' AND data__Identifier = '<TransitGatewayMulticastDomainId>|<GroupIpAddress>|<NetworkInterfaceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_multicast_group_members</code> in a region.
+```sql
+SELECT
+region,
+transit_gateway_multicast_domain_id,
+group_ip_address,
+network_interface_id
+FROM awscc.ec2.transit_gateway_multicast_group_members_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -216,6 +281,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/transit_gateway_multicast_group_members_list_only/index.md b/website/docs/services/ec2/transit_gateway_multicast_group_members_list_only/index.md
deleted file mode 100644
index 04442bf0c..000000000
--- a/website/docs/services/ec2/transit_gateway_multicast_group_members_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: transit_gateway_multicast_group_members_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_multicast_group_members_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_multicast_group_members</code> in a region or regions, for all properties use <a href="/services/ec2/transit_gateway_multicast_group_members/"><code>transit_gateway_multicast_group_members</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_multicast_group_members_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::EC2::TransitGatewayMulticastGroupMember registers and deregisters members and sources (network interfaces) with the transit gateway multicast group</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.transit_gateway_multicast_group_members_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "group_ip_address",
-    "type": "string",
-    "description": "The IP address assigned to the transit gateway multicast group."
-  },
-  {
-    "name": "transit_gateway_multicast_domain_id",
-    "type": "string",
-    "description": "The ID of the transit gateway multicast domain."
-  },
-  {
-    "name": "network_interface_id",
-    "type": "string",
-    "description": "The ID of the transit gateway attachment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_multicast_group_members</code> in a region.
-```sql
-SELECT
-region,
-transit_gateway_multicast_domain_id,
-group_ip_address,
-network_interface_id
-FROM awscc.ec2.transit_gateway_multicast_group_members_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_multicast_group_members_list_only</code> resource, see <a href="/services/ec2/transit_gateway_multicast_group_members/#permissions"><code>transit_gateway_multicast_group_members</code></a>
-
diff --git a/website/docs/services/ec2/transit_gateway_multicast_group_sources/index.md b/website/docs/services/ec2/transit_gateway_multicast_group_sources/index.md
index 09e450b05..70959f321 100644
--- a/website/docs/services/ec2/transit_gateway_multicast_group_sources/index.md
+++ b/website/docs/services/ec2/transit_gateway_multicast_group_sources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transit_gateway_multicast_group_source
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "group_ip_address",
@@ -90,6 +99,33 @@ Creates, updates, deletes or gets a <code>transit_gateway_multicast_group_source
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "group_ip_address",
+    "type": "string",
+    "description": "The IP address assigned to the transit gateway multicast group."
+  },
+  {
+    "name": "transit_gateway_multicast_domain_id",
+    "type": "string",
+    "description": "The ID of the transit gateway multicast domain."
+  },
+  {
+    "name": "network_interface_id",
+    "type": "string",
+    "description": "The ID of the transit gateway attachment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastgroupsource.html"><code>AWS::EC2::TransitGatewayMulticastGroupSource</code></a>.
 
@@ -99,26 +135,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_multicast_group_sources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TransitGatewayMulticastDomainId, NetworkInterfaceId, GroupIpAddress, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_multicast_group_sources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_multicast_group_sources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_multicast_group_sources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -127,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_multicast_group_source</code>.
 ```sql
 SELECT
@@ -144,6 +194,21 @@ source_type
 FROM awscc.ec2.transit_gateway_multicast_group_sources
 WHERE region = 'us-east-1' AND data__Identifier = '<TransitGatewayMulticastDomainId>|<GroupIpAddress>|<NetworkInterfaceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_multicast_group_sources</code> in a region.
+```sql
+SELECT
+region,
+transit_gateway_multicast_domain_id,
+group_ip_address,
+network_interface_id
+FROM awscc.ec2.transit_gateway_multicast_group_sources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -216,6 +281,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/transit_gateway_multicast_group_sources_list_only/index.md b/website/docs/services/ec2/transit_gateway_multicast_group_sources_list_only/index.md
deleted file mode 100644
index b8979a360..000000000
--- a/website/docs/services/ec2/transit_gateway_multicast_group_sources_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: transit_gateway_multicast_group_sources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_multicast_group_sources_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_multicast_group_sources</code> in a region or regions, for all properties use <a href="/services/ec2/transit_gateway_multicast_group_sources/"><code>transit_gateway_multicast_group_sources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_multicast_group_sources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::EC2::TransitGatewayMulticastGroupSource registers and deregisters members and sources (network interfaces) with the transit gateway multicast group</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.transit_gateway_multicast_group_sources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "group_ip_address",
-    "type": "string",
-    "description": "The IP address assigned to the transit gateway multicast group."
-  },
-  {
-    "name": "transit_gateway_multicast_domain_id",
-    "type": "string",
-    "description": "The ID of the transit gateway multicast domain."
-  },
-  {
-    "name": "network_interface_id",
-    "type": "string",
-    "description": "The ID of the transit gateway attachment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_multicast_group_sources</code> in a region.
-```sql
-SELECT
-region,
-transit_gateway_multicast_domain_id,
-group_ip_address,
-network_interface_id
-FROM awscc.ec2.transit_gateway_multicast_group_sources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_multicast_group_sources_list_only</code> resource, see <a href="/services/ec2/transit_gateway_multicast_group_sources/#permissions"><code>transit_gateway_multicast_group_sources</code></a>
-
diff --git a/website/docs/services/ec2/transit_gateway_peering_attachments/index.md b/website/docs/services/ec2/transit_gateway_peering_attachments/index.md
index db6876998..65f130a39 100644
--- a/website/docs/services/ec2/transit_gateway_peering_attachments/index.md
+++ b/website/docs/services/ec2/transit_gateway_peering_attachments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transit_gateway_peering_attachment</co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "status",
@@ -109,6 +118,23 @@ Creates, updates, deletes or gets a <code>transit_gateway_peering_attachment</co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "transit_gateway_attachment_id",
+    "type": "string",
+    "description": "The ID of the transit gateway peering attachment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaypeeringattachment.html"><code>AWS::EC2::TransitGatewayPeeringAttachment</code></a>.
 
@@ -118,31 +144,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_peering_attachments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TransitGatewayId, PeerTransitGatewayId, PeerAccountId, PeerRegion, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_peering_attachments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>transit_gateway_peering_attachments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_peering_attachments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_peering_attachments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +183,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_peering_attachment</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ transit_gateway_attachment_id
 FROM awscc.ec2.transit_gateway_peering_attachments
 WHERE region = 'us-east-1' AND data__Identifier = '<TransitGatewayAttachmentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_peering_attachments</code> in a region.
+```sql
+SELECT
+region,
+transit_gateway_attachment_id
+FROM awscc.ec2.transit_gateway_peering_attachments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -251,6 +305,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.transit_gateway_peering_attachments
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TransitGatewayAttachmentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/transit_gateway_peering_attachments_list_only/index.md b/website/docs/services/ec2/transit_gateway_peering_attachments_list_only/index.md
deleted file mode 100644
index 06b964439..000000000
--- a/website/docs/services/ec2/transit_gateway_peering_attachments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: transit_gateway_peering_attachments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_peering_attachments_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_peering_attachments</code> in a region or regions, for all properties use <a href="/services/ec2/transit_gateway_peering_attachments/"><code>transit_gateway_peering_attachments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_peering_attachments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::EC2::TransitGatewayPeeringAttachment type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.transit_gateway_peering_attachments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "transit_gateway_attachment_id",
-    "type": "string",
-    "description": "The ID of the transit gateway peering attachment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_peering_attachments</code> in a region.
-```sql
-SELECT
-region,
-transit_gateway_attachment_id
-FROM awscc.ec2.transit_gateway_peering_attachments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_peering_attachments_list_only</code> resource, see <a href="/services/ec2/transit_gateway_peering_attachments/#permissions"><code>transit_gateway_peering_attachments</code></a>
-
diff --git a/website/docs/services/ec2/transit_gateway_route_table_associations/index.md b/website/docs/services/ec2/transit_gateway_route_table_associations/index.md
index 019290bbe..18f9dde8e 100644
--- a/website/docs/services/ec2/transit_gateway_route_table_associations/index.md
+++ b/website/docs/services/ec2/transit_gateway_route_table_associations/index.md
@@ -33,6 +33,35 @@ Creates, updates, deletes or gets a <code>transit_gateway_route_table_associatio
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "transit_gateway_route_table_id",
+    "type": "string",
+    "description": "The ID of transit gateway route table."
+  },
+  {
+    "name": "transit_gateway_attachment_id",
+    "type": "string",
+    "description": "The ID of transit gateway attachment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "transit_gateway_route_table_id",
@@ -50,6 +79,8 @@ Creates, updates, deletes or gets a <code>transit_gateway_route_table_associatio
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroutetableassociation.html"><code>AWS::EC2::TransitGatewayRouteTableAssociation</code></a>.
 
@@ -59,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_route_table_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TransitGatewayRouteTableId, TransitGatewayAttachmentId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_route_table_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_route_table_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_route_table_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_route_table_association</code>.
 ```sql
 SELECT
@@ -96,6 +141,20 @@ transit_gateway_attachment_id
 FROM awscc.ec2.transit_gateway_route_table_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<TransitGatewayRouteTableId>|<TransitGatewayAttachmentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_route_table_associations</code> in a region.
+```sql
+SELECT
+region,
+transit_gateway_route_table_id,
+transit_gateway_attachment_id
+FROM awscc.ec2.transit_gateway_route_table_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -162,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/transit_gateway_route_table_associations_list_only/index.md b/website/docs/services/ec2/transit_gateway_route_table_associations_list_only/index.md
deleted file mode 100644
index d92d8727d..000000000
--- a/website/docs/services/ec2/transit_gateway_route_table_associations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: transit_gateway_route_table_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_route_table_associations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_route_table_associations</code> in a region or regions, for all properties use <a href="/services/ec2/transit_gateway_route_table_associations/"><code>transit_gateway_route_table_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_route_table_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::TransitGatewayRouteTableAssociation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.transit_gateway_route_table_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "transit_gateway_route_table_id",
-    "type": "string",
-    "description": "The ID of transit gateway route table."
-  },
-  {
-    "name": "transit_gateway_attachment_id",
-    "type": "string",
-    "description": "The ID of transit gateway attachment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_route_table_associations</code> in a region.
-```sql
-SELECT
-region,
-transit_gateway_route_table_id,
-transit_gateway_attachment_id
-FROM awscc.ec2.transit_gateway_route_table_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_route_table_associations_list_only</code> resource, see <a href="/services/ec2/transit_gateway_route_table_associations/#permissions"><code>transit_gateway_route_table_associations</code></a>
-
diff --git a/website/docs/services/ec2/transit_gateway_route_table_propagations/index.md b/website/docs/services/ec2/transit_gateway_route_table_propagations/index.md
index 94da7b7bc..4af041d33 100644
--- a/website/docs/services/ec2/transit_gateway_route_table_propagations/index.md
+++ b/website/docs/services/ec2/transit_gateway_route_table_propagations/index.md
@@ -33,6 +33,35 @@ Creates, updates, deletes or gets a <code>transit_gateway_route_table_propagatio
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "transit_gateway_route_table_id",
+    "type": "string",
+    "description": "The ID of transit gateway route table."
+  },
+  {
+    "name": "transit_gateway_attachment_id",
+    "type": "string",
+    "description": "The ID of transit gateway attachment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "transit_gateway_route_table_id",
@@ -50,6 +79,8 @@ Creates, updates, deletes or gets a <code>transit_gateway_route_table_propagatio
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroutetablepropagation.html"><code>AWS::EC2::TransitGatewayRouteTablePropagation</code></a>.
 
@@ -59,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_route_table_propagations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TransitGatewayRouteTableId, TransitGatewayAttachmentId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_route_table_propagations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_route_table_propagations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_route_table_propagations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_route_table_propagation</code>.
 ```sql
 SELECT
@@ -96,6 +141,20 @@ transit_gateway_attachment_id
 FROM awscc.ec2.transit_gateway_route_table_propagations
 WHERE region = 'us-east-1' AND data__Identifier = '<TransitGatewayRouteTableId>|<TransitGatewayAttachmentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_route_table_propagations</code> in a region.
+```sql
+SELECT
+region,
+transit_gateway_route_table_id,
+transit_gateway_attachment_id
+FROM awscc.ec2.transit_gateway_route_table_propagations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -162,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/transit_gateway_route_table_propagations_list_only/index.md b/website/docs/services/ec2/transit_gateway_route_table_propagations_list_only/index.md
deleted file mode 100644
index 58f3a01b5..000000000
--- a/website/docs/services/ec2/transit_gateway_route_table_propagations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: transit_gateway_route_table_propagations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_route_table_propagations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_route_table_propagations</code> in a region or regions, for all properties use <a href="/services/ec2/transit_gateway_route_table_propagations/"><code>transit_gateway_route_table_propagations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_route_table_propagations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::EC2::TransitGatewayRouteTablePropagation Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.transit_gateway_route_table_propagations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "transit_gateway_route_table_id",
-    "type": "string",
-    "description": "The ID of transit gateway route table."
-  },
-  {
-    "name": "transit_gateway_attachment_id",
-    "type": "string",
-    "description": "The ID of transit gateway attachment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_route_table_propagations</code> in a region.
-```sql
-SELECT
-region,
-transit_gateway_route_table_id,
-transit_gateway_attachment_id
-FROM awscc.ec2.transit_gateway_route_table_propagations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_route_table_propagations_list_only</code> resource, see <a href="/services/ec2/transit_gateway_route_table_propagations/#permissions"><code>transit_gateway_route_table_propagations</code></a>
-
diff --git a/website/docs/services/ec2/transit_gateway_route_tables/index.md b/website/docs/services/ec2/transit_gateway_route_tables/index.md
index 2ee561afa..e99d8dad6 100644
--- a/website/docs/services/ec2/transit_gateway_route_tables/index.md
+++ b/website/docs/services/ec2/transit_gateway_route_tables/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transit_gateway_route_table</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "transit_gateway_route_table_id",
@@ -67,6 +76,23 @@ Creates, updates, deletes or gets a <code>transit_gateway_route_table</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "transit_gateway_route_table_id",
+    "type": "string",
+    "description": "Transit Gateway Route Table primary identifier"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroutetable.html"><code>AWS::EC2::TransitGatewayRouteTable</code></a>.
 
@@ -76,31 +102,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_route_tables</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TransitGatewayId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_route_tables</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>transit_gateway_route_tables</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_route_tables_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_route_tables</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -109,6 +141,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_route_table</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ tags
 FROM awscc.ec2.transit_gateway_route_tables
 WHERE region = 'us-east-1' AND data__Identifier = '<TransitGatewayRouteTableId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_route_tables</code> in a region.
+```sql
+SELECT
+region,
+transit_gateway_route_table_id
+FROM awscc.ec2.transit_gateway_route_tables_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -185,6 +239,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.transit_gateway_route_tables
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TransitGatewayRouteTableId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/transit_gateway_route_tables_list_only/index.md b/website/docs/services/ec2/transit_gateway_route_tables_list_only/index.md
deleted file mode 100644
index f9ca84c4d..000000000
--- a/website/docs/services/ec2/transit_gateway_route_tables_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: transit_gateway_route_tables_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_route_tables_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_route_tables</code> in a region or regions, for all properties use <a href="/services/ec2/transit_gateway_route_tables/"><code>transit_gateway_route_tables</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_route_tables_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::TransitGatewayRouteTable</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.transit_gateway_route_tables_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "transit_gateway_route_table_id",
-    "type": "string",
-    "description": "Transit Gateway Route Table primary identifier"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_route_tables</code> in a region.
-```sql
-SELECT
-region,
-transit_gateway_route_table_id
-FROM awscc.ec2.transit_gateway_route_tables_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_route_tables_list_only</code> resource, see <a href="/services/ec2/transit_gateway_route_tables/#permissions"><code>transit_gateway_route_tables</code></a>
-
diff --git a/website/docs/services/ec2/transit_gateway_routes/index.md b/website/docs/services/ec2/transit_gateway_routes/index.md
index 70df9d780..51b9784a1 100644
--- a/website/docs/services/ec2/transit_gateway_routes/index.md
+++ b/website/docs/services/ec2/transit_gateway_routes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transit_gateway_route</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "transit_gateway_route_table_id",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets a <code>transit_gateway_route</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "transit_gateway_route_table_id",
+    "type": "string",
+    "description": "The ID of transit gateway route table."
+  },
+  {
+    "name": "destination_cidr_block",
+    "type": "string",
+    "description": "The CIDR range used for destination matches. Routing decisions are based on the most specific match."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroute.html"><code>AWS::EC2::TransitGatewayRoute</code></a>.
 
@@ -69,26 +100,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_routes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TransitGatewayRouteTableId, DestinationCidrBlock, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_routes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_routes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_routes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +133,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_route</code>.
 ```sql
 SELECT
@@ -108,6 +153,20 @@ transit_gateway_attachment_id
 FROM awscc.ec2.transit_gateway_routes
 WHERE region = 'us-east-1' AND data__Identifier = '<TransitGatewayRouteTableId>|<DestinationCidrBlock>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_routes</code> in a region.
+```sql
+SELECT
+region,
+transit_gateway_route_table_id,
+destination_cidr_block
+FROM awscc.ec2.transit_gateway_routes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -182,6 +241,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/transit_gateway_routes_list_only/index.md b/website/docs/services/ec2/transit_gateway_routes_list_only/index.md
deleted file mode 100644
index 0ffb13f5a..000000000
--- a/website/docs/services/ec2/transit_gateway_routes_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: transit_gateway_routes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_routes_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_routes</code> in a region or regions, for all properties use <a href="/services/ec2/transit_gateway_routes/"><code>transit_gateway_routes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_routes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::TransitGatewayRoute</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.transit_gateway_routes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "transit_gateway_route_table_id",
-    "type": "string",
-    "description": "The ID of transit gateway route table."
-  },
-  {
-    "name": "destination_cidr_block",
-    "type": "string",
-    "description": "The CIDR range used for destination matches. Routing decisions are based on the most specific match."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_routes</code> in a region.
-```sql
-SELECT
-region,
-transit_gateway_route_table_id,
-destination_cidr_block
-FROM awscc.ec2.transit_gateway_routes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_routes_list_only</code> resource, see <a href="/services/ec2/transit_gateway_routes/#permissions"><code>transit_gateway_routes</code></a>
-
diff --git a/website/docs/services/ec2/transit_gateway_vpc_attachments/index.md b/website/docs/services/ec2/transit_gateway_vpc_attachments/index.md
index 61f2cef07..0d36f38b6 100644
--- a/website/docs/services/ec2/transit_gateway_vpc_attachments/index.md
+++ b/website/docs/services/ec2/transit_gateway_vpc_attachments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transit_gateway_vpc_attachment</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -114,6 +123,23 @@ Creates, updates, deletes or gets a <code>transit_gateway_vpc_attachment</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayvpcattachment.html"><code>AWS::EC2::TransitGatewayVpcAttachment</code></a>.
 
@@ -123,31 +149,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_vpc_attachments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SubnetIds, VpcId, TransitGatewayId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_vpc_attachments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>transit_gateway_vpc_attachments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_vpc_attachments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_vpc_attachments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +188,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_vpc_attachment</code>.
 ```sql
 SELECT
@@ -171,6 +212,19 @@ options
 FROM awscc.ec2.transit_gateway_vpc_attachments
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_vpc_attachments</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.transit_gateway_vpc_attachments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -268,6 +322,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.transit_gateway_vpc_attachments
+SET data__PatchDocument = string('{{ {
+    "AddSubnetIds": add_subnet_ids,
+    "RemoveSubnetIds": remove_subnet_ids,
+    "Tags": tags,
+    "Options": options
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/transit_gateway_vpc_attachments_list_only/index.md b/website/docs/services/ec2/transit_gateway_vpc_attachments_list_only/index.md
deleted file mode 100644
index 30feb00ed..000000000
--- a/website/docs/services/ec2/transit_gateway_vpc_attachments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: transit_gateway_vpc_attachments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_vpc_attachments_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_vpc_attachments</code> in a region or regions, for all properties use <a href="/services/ec2/transit_gateway_vpc_attachments/"><code>transit_gateway_vpc_attachments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_vpc_attachments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::TransitGatewayVpcAttachment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.transit_gateway_vpc_attachments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_vpc_attachments</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.transit_gateway_vpc_attachments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_vpc_attachments_list_only</code> resource, see <a href="/services/ec2/transit_gateway_vpc_attachments/#permissions"><code>transit_gateway_vpc_attachments</code></a>
-
diff --git a/website/docs/services/ec2/transit_gateways/index.md b/website/docs/services/ec2/transit_gateways/index.md
index 0599c5732..f59ce4c02 100644
--- a/website/docs/services/ec2/transit_gateways/index.md
+++ b/website/docs/services/ec2/transit_gateways/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transit_gateway</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "default_route_table_propagation",
@@ -127,6 +136,23 @@ Creates, updates, deletes or gets a <code>transit_gateway</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html"><code>AWS::EC2::TransitGateway</code></a>.
 
@@ -136,31 +162,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateways</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateways</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>transit_gateways</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateways_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateways</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -169,6 +201,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway</code>.
 ```sql
 SELECT
@@ -191,6 +232,19 @@ propagation_default_route_table_id
 FROM awscc.ec2.transit_gateways
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateways</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.transit_gateways_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -326,6 +380,29 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.transit_gateways
+SET data__PatchDocument = string('{{ {
+    "DefaultRouteTablePropagation": default_route_table_propagation,
+    "Description": description,
+    "AutoAcceptSharedAttachments": auto_accept_shared_attachments,
+    "DefaultRouteTableAssociation": default_route_table_association,
+    "VpnEcmpSupport": vpn_ecmp_support,
+    "DnsSupport": dns_support,
+    "SecurityGroupReferencingSupport": security_group_referencing_support,
+    "TransitGatewayCidrBlocks": transit_gateway_cidr_blocks,
+    "Tags": tags,
+    "AssociationDefaultRouteTableId": association_default_route_table_id,
+    "PropagationDefaultRouteTableId": propagation_default_route_table_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/transit_gateways_list_only/index.md b/website/docs/services/ec2/transit_gateways_list_only/index.md
deleted file mode 100644
index e2a54a2ab..000000000
--- a/website/docs/services/ec2/transit_gateways_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: transit_gateways_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateways_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateways</code> in a region or regions, for all properties use <a href="/services/ec2/transit_gateways/"><code>transit_gateways</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateways_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::TransitGateway</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.transit_gateways_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateways</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.transit_gateways_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateways_list_only</code> resource, see <a href="/services/ec2/transit_gateways/#permissions"><code>transit_gateways</code></a>
-
diff --git a/website/docs/services/ec2/verified_access_endpoints/index.md b/website/docs/services/ec2/verified_access_endpoints/index.md
index 629dac116..ae7d15c50 100644
--- a/website/docs/services/ec2/verified_access_endpoints/index.md
+++ b/website/docs/services/ec2/verified_access_endpoints/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>verified_access_endpoint</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "verified_access_endpoint_id",
@@ -323,6 +332,23 @@ Creates, updates, deletes or gets a <code>verified_access_endpoint</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "verified_access_endpoint_id",
+    "type": "string",
+    "description": "The ID of the AWS Verified Access endpoint."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-verifiedaccessendpoint.html"><code>AWS::EC2::VerifiedAccessEndpoint</code></a>.
 
@@ -332,31 +358,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>verified_access_endpoints</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AttachmentType, EndpointType, VerifiedAccessGroupId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>verified_access_endpoints</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>verified_access_endpoints</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>verified_access_endpoints_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>verified_access_endpoints</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -365,6 +397,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>verified_access_endpoint</code>.
 ```sql
 SELECT
@@ -395,6 +436,19 @@ sse_specification
 FROM awscc.ec2.verified_access_endpoints
 WHERE region = 'us-east-1' AND data__Identifier = '<VerifiedAccessEndpointId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>verified_access_endpoints</code> in a region.
+```sql
+SELECT
+region,
+verified_access_endpoint_id
+FROM awscc.ec2.verified_access_endpoints_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -551,6 +605,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.verified_access_endpoints
+SET data__PatchDocument = string('{{ {
+    "VerifiedAccessGroupId": verified_access_group_id,
+    "Description": description,
+    "PolicyDocument": policy_document,
+    "PolicyEnabled": policy_enabled,
+    "Tags": tags,
+    "SseSpecification": sse_specification
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<VerifiedAccessEndpointId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/verified_access_endpoints_list_only/index.md b/website/docs/services/ec2/verified_access_endpoints_list_only/index.md
deleted file mode 100644
index f8eb5d1d1..000000000
--- a/website/docs/services/ec2/verified_access_endpoints_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: verified_access_endpoints_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - verified_access_endpoints_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>verified_access_endpoints</code> in a region or regions, for all properties use <a href="/services/ec2/verified_access_endpoints/"><code>verified_access_endpoints</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>verified_access_endpoints_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::EC2::VerifiedAccessEndpoint resource creates an AWS EC2 Verified Access Endpoint.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.verified_access_endpoints_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "verified_access_endpoint_id",
-    "type": "string",
-    "description": "The ID of the AWS Verified Access endpoint."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>verified_access_endpoints</code> in a region.
-```sql
-SELECT
-region,
-verified_access_endpoint_id
-FROM awscc.ec2.verified_access_endpoints_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>verified_access_endpoints_list_only</code> resource, see <a href="/services/ec2/verified_access_endpoints/#permissions"><code>verified_access_endpoints</code></a>
-
diff --git a/website/docs/services/ec2/verified_access_groups/index.md b/website/docs/services/ec2/verified_access_groups/index.md
index df08fe4a8..fa4b15e47 100644
--- a/website/docs/services/ec2/verified_access_groups/index.md
+++ b/website/docs/services/ec2/verified_access_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>verified_access_group</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "verified_access_group_id",
@@ -119,6 +128,23 @@ Creates, updates, deletes or gets a <code>verified_access_group</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "verified_access_group_id",
+    "type": "string",
+    "description": "The ID of the AWS Verified Access group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-verifiedaccessgroup.html"><code>AWS::EC2::VerifiedAccessGroup</code></a>.
 
@@ -128,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>verified_access_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VerifiedAccessInstanceId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>verified_access_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>verified_access_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>verified_access_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>verified_access_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>verified_access_group</code>.
 ```sql
 SELECT
@@ -179,6 +220,19 @@ sse_specification
 FROM awscc.ec2.verified_access_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<VerifiedAccessGroupId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>verified_access_groups</code> in a region.
+```sql
+SELECT
+region,
+verified_access_group_id
+FROM awscc.ec2.verified_access_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -263,6 +317,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.verified_access_groups
+SET data__PatchDocument = string('{{ {
+    "VerifiedAccessInstanceId": verified_access_instance_id,
+    "Description": description,
+    "PolicyDocument": policy_document,
+    "PolicyEnabled": policy_enabled,
+    "Tags": tags,
+    "SseSpecification": sse_specification
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<VerifiedAccessGroupId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/verified_access_groups_list_only/index.md b/website/docs/services/ec2/verified_access_groups_list_only/index.md
deleted file mode 100644
index 77ba12b92..000000000
--- a/website/docs/services/ec2/verified_access_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: verified_access_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - verified_access_groups_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>verified_access_groups</code> in a region or regions, for all properties use <a href="/services/ec2/verified_access_groups/"><code>verified_access_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>verified_access_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::EC2::VerifiedAccessGroup resource creates an AWS EC2 Verified Access Group.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.verified_access_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "verified_access_group_id",
-    "type": "string",
-    "description": "The ID of the AWS Verified Access group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>verified_access_groups</code> in a region.
-```sql
-SELECT
-region,
-verified_access_group_id
-FROM awscc.ec2.verified_access_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>verified_access_groups_list_only</code> resource, see <a href="/services/ec2/verified_access_groups/#permissions"><code>verified_access_groups</code></a>
-
diff --git a/website/docs/services/ec2/verified_access_instances/index.md b/website/docs/services/ec2/verified_access_instances/index.md
index c53faa515..b33538c9f 100644
--- a/website/docs/services/ec2/verified_access_instances/index.md
+++ b/website/docs/services/ec2/verified_access_instances/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>verified_access_instance</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "verified_access_instance_id",
@@ -362,6 +371,23 @@ Creates, updates, deletes or gets a <code>verified_access_instance</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "verified_access_instance_id",
+    "type": "string",
+    "description": "The ID of the AWS Verified Access instance."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-verifiedaccessinstance.html"><code>AWS::EC2::VerifiedAccessInstance</code></a>.
 
@@ -371,31 +397,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>verified_access_instances</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>verified_access_instances</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>verified_access_instances</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>verified_access_instances_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>verified_access_instances</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -404,6 +436,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>verified_access_instance</code>.
 ```sql
 SELECT
@@ -422,6 +463,19 @@ cidr_endpoints_custom_sub_domain_name_servers
 FROM awscc.ec2.verified_access_instances
 WHERE region = 'us-east-1' AND data__Identifier = '<VerifiedAccessInstanceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>verified_access_instances</code> in a region.
+```sql
+SELECT
+region,
+verified_access_instance_id
+FROM awscc.ec2.verified_access_instances_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -564,6 +618,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.verified_access_instances
+SET data__PatchDocument = string('{{ {
+    "VerifiedAccessTrustProviders": verified_access_trust_providers,
+    "VerifiedAccessTrustProviderIds": verified_access_trust_provider_ids,
+    "Description": description,
+    "LoggingConfigurations": logging_configurations,
+    "Tags": tags,
+    "FipsEnabled": fips_enabled,
+    "CidrEndpointsCustomSubDomain": cidr_endpoints_custom_sub_domain
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<VerifiedAccessInstanceId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/verified_access_instances_list_only/index.md b/website/docs/services/ec2/verified_access_instances_list_only/index.md
deleted file mode 100644
index 05117babc..000000000
--- a/website/docs/services/ec2/verified_access_instances_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: verified_access_instances_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - verified_access_instances_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>verified_access_instances</code> in a region or regions, for all properties use <a href="/services/ec2/verified_access_instances/"><code>verified_access_instances</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>verified_access_instances_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::EC2::VerifiedAccessInstance resource creates an AWS EC2 Verified Access Instance.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.verified_access_instances_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "verified_access_instance_id",
-    "type": "string",
-    "description": "The ID of the AWS Verified Access instance."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>verified_access_instances</code> in a region.
-```sql
-SELECT
-region,
-verified_access_instance_id
-FROM awscc.ec2.verified_access_instances_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>verified_access_instances_list_only</code> resource, see <a href="/services/ec2/verified_access_instances/#permissions"><code>verified_access_instances</code></a>
-
diff --git a/website/docs/services/ec2/verified_access_trust_providers/index.md b/website/docs/services/ec2/verified_access_trust_providers/index.md
index 9a8f8af61..f30ac3be3 100644
--- a/website/docs/services/ec2/verified_access_trust_providers/index.md
+++ b/website/docs/services/ec2/verified_access_trust_providers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>verified_access_trust_provider</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "trust_provider_type",
@@ -220,6 +229,23 @@ Creates, updates, deletes or gets a <code>verified_access_trust_provider</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "verified_access_trust_provider_id",
+    "type": "string",
+    "description": "The ID of the Amazon Web Services Verified Access trust provider."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-verifiedaccesstrustprovider.html"><code>AWS::EC2::VerifiedAccessTrustProvider</code></a>.
 
@@ -229,31 +255,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>verified_access_trust_providers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TrustProviderType, PolicyReferenceName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>verified_access_trust_providers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>verified_access_trust_providers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>verified_access_trust_providers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>verified_access_trust_providers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -262,6 +294,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>verified_access_trust_provider</code>.
 ```sql
 SELECT
@@ -282,6 +323,19 @@ native_application_oidc_options
 FROM awscc.ec2.verified_access_trust_providers
 WHERE region = 'us-east-1' AND data__Identifier = '<VerifiedAccessTrustProviderId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>verified_access_trust_providers</code> in a region.
+```sql
+SELECT
+region,
+verified_access_trust_provider_id
+FROM awscc.ec2.verified_access_trust_providers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -401,6 +455,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.verified_access_trust_providers
+SET data__PatchDocument = string('{{ {
+    "OidcOptions": oidc_options,
+    "Description": description,
+    "Tags": tags,
+    "SseSpecification": sse_specification,
+    "NativeApplicationOidcOptions": native_application_oidc_options
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<VerifiedAccessTrustProviderId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/verified_access_trust_providers_list_only/index.md b/website/docs/services/ec2/verified_access_trust_providers_list_only/index.md
deleted file mode 100644
index a285d4cec..000000000
--- a/website/docs/services/ec2/verified_access_trust_providers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: verified_access_trust_providers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - verified_access_trust_providers_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>verified_access_trust_providers</code> in a region or regions, for all properties use <a href="/services/ec2/verified_access_trust_providers/"><code>verified_access_trust_providers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>verified_access_trust_providers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::EC2::VerifiedAccessTrustProvider type describes a verified access trust provider</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.verified_access_trust_providers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "verified_access_trust_provider_id",
-    "type": "string",
-    "description": "The ID of the Amazon Web Services Verified Access trust provider."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>verified_access_trust_providers</code> in a region.
-```sql
-SELECT
-region,
-verified_access_trust_provider_id
-FROM awscc.ec2.verified_access_trust_providers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>verified_access_trust_providers_list_only</code> resource, see <a href="/services/ec2/verified_access_trust_providers/#permissions"><code>verified_access_trust_providers</code></a>
-
diff --git a/website/docs/services/ec2/volume_attachments/index.md b/website/docs/services/ec2/volume_attachments/index.md
index 47844d3c6..ffe9cc999 100644
--- a/website/docs/services/ec2/volume_attachments/index.md
+++ b/website/docs/services/ec2/volume_attachments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>volume_attachment</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "volume_id",
@@ -55,6 +64,28 @@ Creates, updates, deletes or gets a <code>volume_attachment</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "volume_id",
+    "type": "string",
+    "description": "The ID of the Amazon EBS volume. The volume and instance must be within the same Availability Zone. This value can be a reference to an &#91;AWS::EC2::Volume&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html) resource, or it can be the volume ID of an existing Amazon EBS volume."
+  },
+  {
+    "name": "instance_id",
+    "type": "string",
+    "description": "The ID of the instance to which the volume attaches. This value can be a reference to an &#91;AWS::EC2::Instance&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html) resource, or it can be the physical ID of an existing EC2 instance."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volumeattachment.html"><code>AWS::EC2::VolumeAttachment</code></a>.
 
@@ -64,26 +95,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>volume_attachments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VolumeId, InstanceId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>volume_attachments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>volume_attachments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>volume_attachments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +128,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>volume_attachment</code>.
 ```sql
 SELECT
@@ -102,6 +147,20 @@ device
 FROM awscc.ec2.volume_attachments
 WHERE region = 'us-east-1' AND data__Identifier = '<VolumeId>|<InstanceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>volume_attachments</code> in a region.
+```sql
+SELECT
+region,
+volume_id,
+instance_id
+FROM awscc.ec2.volume_attachments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -172,6 +231,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/volume_attachments_list_only/index.md b/website/docs/services/ec2/volume_attachments_list_only/index.md
deleted file mode 100644
index d1a21588f..000000000
--- a/website/docs/services/ec2/volume_attachments_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: volume_attachments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - volume_attachments_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>volume_attachments</code> in a region or regions, for all properties use <a href="/services/ec2/volume_attachments/"><code>volume_attachments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>volume_attachments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Attaches an Amazon EBS volume to a running instance and exposes it to the instance with the specified device name.<br />Before this resource can be deleted (and therefore the volume detached), you must first unmount the volume in the instance. Failure to do so results in the volume being stuck in the busy state while it is trying to detach, which could possibly damage the file system or the data it contains.<br />If an Amazon EBS volume is the root device of an instance, it cannot be detached while the instance is in the "running" state. To detach the root volume, stop the instance first.<br />If the root volume is detached from an instance with an MKT product code, then the product codes from that volume are no longer associated with the instance.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.volume_attachments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "volume_id",
-    "type": "string",
-    "description": "The ID of the Amazon EBS volume. The volume and instance must be within the same Availability Zone. This value can be a reference to an &#91;AWS::EC2::Volume&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html) resource, or it can be the volume ID of an existing Amazon EBS volume."
-  },
-  {
-    "name": "instance_id",
-    "type": "string",
-    "description": "The ID of the instance to which the volume attaches. This value can be a reference to an &#91;AWS::EC2::Instance&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html) resource, or it can be the physical ID of an existing EC2 instance."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>volume_attachments</code> in a region.
-```sql
-SELECT
-region,
-volume_id,
-instance_id
-FROM awscc.ec2.volume_attachments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>volume_attachments_list_only</code> resource, see <a href="/services/ec2/volume_attachments/#permissions"><code>volume_attachments</code></a>
-
diff --git a/website/docs/services/ec2/volumes/index.md b/website/docs/services/ec2/volumes/index.md
index 9f20402e1..0e5fc8101 100644
--- a/website/docs/services/ec2/volumes/index.md
+++ b/website/docs/services/ec2/volumes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>volume</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "multi_attach_enabled",
@@ -122,6 +131,23 @@ Creates, updates, deletes or gets a <code>volume</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "volume_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html"><code>AWS::EC2::Volume</code></a>.
 
@@ -131,31 +157,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>volumes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AvailabilityZone, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>volumes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>volumes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>volumes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>volumes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -164,6 +196,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>volume</code>.
 ```sql
 SELECT
@@ -185,6 +226,19 @@ tags
 FROM awscc.ec2.volumes
 WHERE region = 'us-east-1' AND data__Identifier = '<VolumeId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>volumes</code> in a region.
+```sql
+SELECT
+region,
+volume_id
+FROM awscc.ec2.volumes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -295,6 +349,31 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.volumes
+SET data__PatchDocument = string('{{ {
+    "MultiAttachEnabled": multi_attach_enabled,
+    "KmsKeyId": kms_key_id,
+    "Encrypted": encrypted,
+    "Size": size,
+    "AutoEnableIO": auto_enable_io,
+    "OutpostArn": outpost_arn,
+    "AvailabilityZone": availability_zone,
+    "Throughput": throughput,
+    "Iops": iops,
+    "VolumeInitializationRate": volume_initialization_rate,
+    "SnapshotId": snapshot_id,
+    "VolumeType": volume_type,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<VolumeId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/volumes_list_only/index.md b/website/docs/services/ec2/volumes_list_only/index.md
deleted file mode 100644
index adc11c272..000000000
--- a/website/docs/services/ec2/volumes_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: volumes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - volumes_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>volumes</code> in a region or regions, for all properties use <a href="/services/ec2/volumes/"><code>volumes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>volumes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies an Amazon Elastic Block Store (Amazon EBS) volume.<br />When you use CFNlong to update an Amazon EBS volume that modifies &#96;&#96;Iops&#96;&#96;, &#96;&#96;Size&#96;&#96;, or &#96;&#96;VolumeType&#96;&#96;, there is a cooldown period before another operation can occur. This can cause your stack to report being in &#96;&#96;UPDATE&#95;IN&#95;PROGRESS&#96;&#96; or &#96;&#96;UPDATE&#95;ROLLBACK&#95;IN&#95;PROGRESS&#96;&#96; for long periods of time.<br />Amazon EBS does not support sizing down an Amazon EBS volume. CFNlong does not attempt to modify an Amazon EBS volume to a smaller size on rollback.<br />Some common scenarios when you might encounter a cooldown period for Amazon EBS include:<br />+ You successfully update an Amazon EBS volume and the update succeeds. When you attempt another update within the cooldown window, that update will be subject to a cooldown period.<br />+ You successfully update an Amazon EBS volume and the update succeeds but another change in your &#96;&#96;update-stack&#96;&#96; call fails. The rollback will be subject to a cooldown period.<br /><br />For more information, see &#91;Requirements for EBS volume modifications&#93;(https://docs.aws.amazon.com/ebs/latest/userguide/modify-volume-requirements.html).<br />&#42;DeletionPolicy attribute&#42; <br />To control how CFNlong handles the volume when the stack is deleted, set a deletion policy for your volume. You can choose to retain the volume, to delete the volume, or to create a snapshot of the volume. For more information, see &#91;DeletionPolicy attribute&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html).<br />If you set a deletion policy that creates a snapshot, all tags on the volume are included in the snapshot.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.volumes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "volume_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>volumes</code> in a region.
-```sql
-SELECT
-region,
-volume_id
-FROM awscc.ec2.volumes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>volumes_list_only</code> resource, see <a href="/services/ec2/volumes/#permissions"><code>volumes</code></a>
-
diff --git a/website/docs/services/ec2/vpc_block_public_access_exclusions/index.md b/website/docs/services/ec2/vpc_block_public_access_exclusions/index.md
index 4a9663915..977c75241 100644
--- a/website/docs/services/ec2/vpc_block_public_access_exclusions/index.md
+++ b/website/docs/services/ec2/vpc_block_public_access_exclusions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_block_public_access_exclusion</cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "exclusion_id",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>vpc_block_public_access_exclusion</cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "exclusion_id",
+    "type": "string",
+    "description": "The ID of the exclusion"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcblockpublicaccessexclusion.html"><code>AWS::EC2::VPCBlockPublicAccessExclusion</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_block_public_access_exclusions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InternetGatewayExclusionMode, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_block_public_access_exclusions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_block_public_access_exclusions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_block_public_access_exclusions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_block_public_access_exclusions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_block_public_access_exclusion</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.ec2.vpc_block_public_access_exclusions
 WHERE region = 'us-east-1' AND data__Identifier = '<ExclusionId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_block_public_access_exclusions</code> in a region.
+```sql
+SELECT
+region,
+exclusion_id
+FROM awscc.ec2.vpc_block_public_access_exclusions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +259,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.vpc_block_public_access_exclusions
+SET data__PatchDocument = string('{{ {
+    "InternetGatewayExclusionMode": internet_gateway_exclusion_mode,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ExclusionId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/vpc_block_public_access_exclusions_list_only/index.md b/website/docs/services/ec2/vpc_block_public_access_exclusions_list_only/index.md
deleted file mode 100644
index b835893b5..000000000
--- a/website/docs/services/ec2/vpc_block_public_access_exclusions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpc_block_public_access_exclusions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_block_public_access_exclusions_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_block_public_access_exclusions</code> in a region or regions, for all properties use <a href="/services/ec2/vpc_block_public_access_exclusions/"><code>vpc_block_public_access_exclusions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_block_public_access_exclusions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::VPCBlockPublicAccessExclusion.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.vpc_block_public_access_exclusions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "exclusion_id",
-    "type": "string",
-    "description": "The ID of the exclusion"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_block_public_access_exclusions</code> in a region.
-```sql
-SELECT
-region,
-exclusion_id
-FROM awscc.ec2.vpc_block_public_access_exclusions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_block_public_access_exclusions_list_only</code> resource, see <a href="/services/ec2/vpc_block_public_access_exclusions/#permissions"><code>vpc_block_public_access_exclusions</code></a>
-
diff --git a/website/docs/services/ec2/vpc_block_public_access_options/index.md b/website/docs/services/ec2/vpc_block_public_access_options/index.md
index 7845dc66b..51bb7f23f 100644
--- a/website/docs/services/ec2/vpc_block_public_access_options/index.md
+++ b/website/docs/services/ec2/vpc_block_public_access_options/index.md
@@ -162,6 +162,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.vpc_block_public_access_options
+SET data__PatchDocument = string('{{ {
+    "InternetGatewayBlockMode": internet_gateway_block_mode
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/vpc_cidr_blocks/index.md b/website/docs/services/ec2/vpc_cidr_blocks/index.md
index 10f19a52a..229694497 100644
--- a/website/docs/services/ec2/vpc_cidr_blocks/index.md
+++ b/website/docs/services/ec2/vpc_cidr_blocks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_cidr_block</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cidr_block",
@@ -105,6 +114,28 @@ Creates, updates, deletes or gets a <code>vpc_cidr_block</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The Id of the VPC associated CIDR Block."
+  },
+  {
+    "name": "vpc_id",
+    "type": "string",
+    "description": "The ID of the VPC."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpccidrblock.html"><code>AWS::EC2::VPCCidrBlock</code></a>.
 
@@ -114,26 +145,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_cidr_blocks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_cidr_blocks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_cidr_blocks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_cidr_blocks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -142,6 +178,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_cidr_block</code>.
 ```sql
 SELECT
@@ -162,6 +207,20 @@ ipv6_cidr_block_network_border_group
 FROM awscc.ec2.vpc_cidr_blocks
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>|<VpcId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_cidr_blocks</code> in a region.
+```sql
+SELECT
+region,
+id,
+vpc_id
+FROM awscc.ec2.vpc_cidr_blocks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -258,6 +317,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/vpc_cidr_blocks_list_only/index.md b/website/docs/services/ec2/vpc_cidr_blocks_list_only/index.md
deleted file mode 100644
index c6752b950..000000000
--- a/website/docs/services/ec2/vpc_cidr_blocks_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: vpc_cidr_blocks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_cidr_blocks_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_cidr_blocks</code> in a region or regions, for all properties use <a href="/services/ec2/vpc_cidr_blocks/"><code>vpc_cidr_blocks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_cidr_blocks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::VPCCidrBlock</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.vpc_cidr_blocks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The Id of the VPC associated CIDR Block."
-  },
-  {
-    "name": "vpc_id",
-    "type": "string",
-    "description": "The ID of the VPC."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_cidr_blocks</code> in a region.
-```sql
-SELECT
-region,
-id,
-vpc_id
-FROM awscc.ec2.vpc_cidr_blocks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_cidr_blocks_list_only</code> resource, see <a href="/services/ec2/vpc_cidr_blocks/#permissions"><code>vpc_cidr_blocks</code></a>
-
diff --git a/website/docs/services/ec2/vpc_endpoint_connection_notifications/index.md b/website/docs/services/ec2/vpc_endpoint_connection_notifications/index.md
index 7cc37bff6..82d245bb3 100644
--- a/website/docs/services/ec2/vpc_endpoint_connection_notifications/index.md
+++ b/website/docs/services/ec2/vpc_endpoint_connection_notifications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_endpoint_connection_notification</
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "connection_events",
@@ -65,6 +74,23 @@ Creates, updates, deletes or gets a <code>vpc_endpoint_connection_notification</
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "vpc_endpoint_connection_notification_id",
+    "type": "string",
+    "description": "VPC Endpoint Connection ID generated by service"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointconnectionnotification.html"><code>AWS::EC2::VPCEndpointConnectionNotification</code></a>.
 
@@ -74,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_endpoint_connection_notifications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConnectionEvents, ConnectionNotificationArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_endpoint_connection_notifications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_endpoint_connection_notifications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_endpoint_connection_notifications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_endpoint_connection_notifications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_endpoint_connection_notification</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ service_id
 FROM awscc.ec2.vpc_endpoint_connection_notifications
 WHERE region = 'us-east-1' AND data__Identifier = '<VPCEndpointConnectionNotificationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_endpoint_connection_notifications</code> in a region.
+```sql
+SELECT
+region,
+vpc_endpoint_connection_notification_id
+FROM awscc.ec2.vpc_endpoint_connection_notifications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -194,6 +248,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.vpc_endpoint_connection_notifications
+SET data__PatchDocument = string('{{ {
+    "ConnectionEvents": connection_events,
+    "ConnectionNotificationArn": connection_notification_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<VPCEndpointConnectionNotificationId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/vpc_endpoint_connection_notifications_list_only/index.md b/website/docs/services/ec2/vpc_endpoint_connection_notifications_list_only/index.md
deleted file mode 100644
index 6f589d4e0..000000000
--- a/website/docs/services/ec2/vpc_endpoint_connection_notifications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpc_endpoint_connection_notifications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_endpoint_connection_notifications_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_endpoint_connection_notifications</code> in a region or regions, for all properties use <a href="/services/ec2/vpc_endpoint_connection_notifications/"><code>vpc_endpoint_connection_notifications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_endpoint_connection_notifications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::VPCEndpointConnectionNotification</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.vpc_endpoint_connection_notifications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "vpc_endpoint_connection_notification_id",
-    "type": "string",
-    "description": "VPC Endpoint Connection ID generated by service"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_endpoint_connection_notifications</code> in a region.
-```sql
-SELECT
-region,
-vpc_endpoint_connection_notification_id
-FROM awscc.ec2.vpc_endpoint_connection_notifications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_endpoint_connection_notifications_list_only</code> resource, see <a href="/services/ec2/vpc_endpoint_connection_notifications/#permissions"><code>vpc_endpoint_connection_notifications</code></a>
-
diff --git a/website/docs/services/ec2/vpc_endpoint_service_permissions/index.md b/website/docs/services/ec2/vpc_endpoint_service_permissions/index.md
index 70d30dbfa..fb1688cb8 100644
--- a/website/docs/services/ec2/vpc_endpoint_service_permissions/index.md
+++ b/website/docs/services/ec2/vpc_endpoint_service_permissions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_endpoint_service_permission</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "allowed_principals",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>vpc_endpoint_service_permission</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "service_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointservicepermission.html"><code>AWS::EC2::VPCEndpointServicePermissions</code></a>.
 
@@ -59,31 +85,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_endpoint_service_permissions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ServiceId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_endpoint_service_permissions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_endpoint_service_permissions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_endpoint_service_permissions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_endpoint_service_permissions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +124,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_endpoint_service_permission</code>.
 ```sql
 SELECT
@@ -101,6 +142,19 @@ service_id
 FROM awscc.ec2.vpc_endpoint_service_permissions
 WHERE region = 'us-east-1' AND data__Identifier = '<ServiceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_endpoint_service_permissions</code> in a region.
+```sql
+SELECT
+region,
+service_id
+FROM awscc.ec2.vpc_endpoint_service_permissions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -166,6 +220,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.vpc_endpoint_service_permissions
+SET data__PatchDocument = string('{{ {
+    "AllowedPrincipals": allowed_principals
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ServiceId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/vpc_endpoint_service_permissions_list_only/index.md b/website/docs/services/ec2/vpc_endpoint_service_permissions_list_only/index.md
deleted file mode 100644
index f4ddbf669..000000000
--- a/website/docs/services/ec2/vpc_endpoint_service_permissions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpc_endpoint_service_permissions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_endpoint_service_permissions_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_endpoint_service_permissions</code> in a region or regions, for all properties use <a href="/services/ec2/vpc_endpoint_service_permissions/"><code>vpc_endpoint_service_permissions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_endpoint_service_permissions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::VPCEndpointServicePermissions</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.vpc_endpoint_service_permissions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "service_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_endpoint_service_permissions</code> in a region.
-```sql
-SELECT
-region,
-service_id
-FROM awscc.ec2.vpc_endpoint_service_permissions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_endpoint_service_permissions_list_only</code> resource, see <a href="/services/ec2/vpc_endpoint_service_permissions/#permissions"><code>vpc_endpoint_service_permissions</code></a>
-
diff --git a/website/docs/services/ec2/vpc_endpoint_services/index.md b/website/docs/services/ec2/vpc_endpoint_services/index.md
index 95f59c131..48cf1d86a 100644
--- a/website/docs/services/ec2/vpc_endpoint_services/index.md
+++ b/website/docs/services/ec2/vpc_endpoint_services/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_endpoint_service</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "network_load_balancer_arns",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>vpc_endpoint_service</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "service_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointservice.html"><code>AWS::EC2::VPCEndpointService</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_endpoint_services</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_endpoint_services</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_endpoint_services</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_endpoint_services_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_endpoint_services</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_endpoint_service</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ supported_regions
 FROM awscc.ec2.vpc_endpoint_services
 WHERE region = 'us-east-1' AND data__Identifier = '<ServiceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_endpoint_services</code> in a region.
+```sql
+SELECT
+region,
+service_id
+FROM awscc.ec2.vpc_endpoint_services_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -263,6 +317,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.vpc_endpoint_services
+SET data__PatchDocument = string('{{ {
+    "NetworkLoadBalancerArns": network_load_balancer_arns,
+    "ContributorInsightsEnabled": contributor_insights_enabled,
+    "PayerResponsibility": payer_responsibility,
+    "AcceptanceRequired": acceptance_required,
+    "GatewayLoadBalancerArns": gateway_load_balancer_arns,
+    "Tags": tags,
+    "SupportedIpAddressTypes": supported_ip_address_types,
+    "SupportedRegions": supported_regions
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ServiceId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/vpc_endpoint_services_list_only/index.md b/website/docs/services/ec2/vpc_endpoint_services_list_only/index.md
deleted file mode 100644
index df74f1553..000000000
--- a/website/docs/services/ec2/vpc_endpoint_services_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpc_endpoint_services_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_endpoint_services_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_endpoint_services</code> in a region or regions, for all properties use <a href="/services/ec2/vpc_endpoint_services/"><code>vpc_endpoint_services</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_endpoint_services_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::VPCEndpointService</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.vpc_endpoint_services_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "service_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_endpoint_services</code> in a region.
-```sql
-SELECT
-region,
-service_id
-FROM awscc.ec2.vpc_endpoint_services_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_endpoint_services_list_only</code> resource, see <a href="/services/ec2/vpc_endpoint_services/#permissions"><code>vpc_endpoint_services</code></a>
-
diff --git a/website/docs/services/ec2/vpc_endpoints/index.md b/website/docs/services/ec2/vpc_endpoints/index.md
index 362945418..e5d86dff6 100644
--- a/website/docs/services/ec2/vpc_endpoints/index.md
+++ b/website/docs/services/ec2/vpc_endpoints/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_endpoint</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "private_dns_enabled",
@@ -154,6 +163,23 @@ Creates, updates, deletes or gets a <code>vpc_endpoint</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html"><code>AWS::EC2::VPCEndpoint</code></a>.
 
@@ -163,31 +189,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_endpoints</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_endpoints</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_endpoints</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_endpoints_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_endpoints</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -196,6 +228,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_endpoint</code>.
 ```sql
 SELECT
@@ -221,6 +262,19 @@ tags
 FROM awscc.ec2.vpc_endpoints
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_endpoints</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.vpc_endpoints_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -340,6 +394,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.vpc_endpoints
+SET data__PatchDocument = string('{{ {
+    "PrivateDnsEnabled": private_dns_enabled,
+    "IpAddressType": ip_address_type,
+    "DnsOptions": dns_options,
+    "SecurityGroupIds": security_group_ids,
+    "SubnetIds": subnet_ids,
+    "RouteTableIds": route_table_ids,
+    "PolicyDocument": policy_document,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/vpc_endpoints_list_only/index.md b/website/docs/services/ec2/vpc_endpoints_list_only/index.md
deleted file mode 100644
index 36348235e..000000000
--- a/website/docs/services/ec2/vpc_endpoints_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpc_endpoints_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_endpoints_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_endpoints</code> in a region or regions, for all properties use <a href="/services/ec2/vpc_endpoints/"><code>vpc_endpoints</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_endpoints_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a VPC endpoint. A VPC endpoint provides a private connection between your VPC and an endpoint service. You can use an endpoint service provided by AWS, an MKT Partner, or another AWS accounts in your organization. For more information, see the &#91;User Guide&#93;(https://docs.aws.amazon.com/vpc/latest/privatelink/).<br />An endpoint of type &#96;&#96;Interface&#96;&#96; establishes connections between the subnets in your VPC and an AWS-service, your own service, or a service hosted by another AWS-account. With an interface VPC endpoint, you specify the subnets in which to create the endpoint and the security groups to associate with the endpoint network interfaces.<br />An endpoint of type &#96;&#96;gateway&#96;&#96; serves as a target for a route in your route table for traffic destined for S3 or DDB. You can specify an endpoint policy for the endpoint, which controls access to the service from your VPC. You can also specify the VPC route tables that use the endpoint. For more information about connectivity to S3, see &#91;Why can't I connect to an S3 bucket using a gateway VPC endpoint?&#93;(https://docs.aws.amazon.com/premiumsupport/knowledge-center/connect-s3-vpc-endpoint)<br />An endpoint of type &#96;&#96;GatewayLoadBalancer&#96;&#96; provides private connectivity between your VPC and virtual appliances from a service provider.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.vpc_endpoints_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_endpoints</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.vpc_endpoints_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_endpoints_list_only</code> resource, see <a href="/services/ec2/vpc_endpoints/#permissions"><code>vpc_endpoints</code></a>
-
diff --git a/website/docs/services/ec2/vpc_gateway_attachments/index.md b/website/docs/services/ec2/vpc_gateway_attachments/index.md
index 76f32cf82..c387170d8 100644
--- a/website/docs/services/ec2/vpc_gateway_attachments/index.md
+++ b/website/docs/services/ec2/vpc_gateway_attachments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_gateway_attachment</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "attachment_type",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets a <code>vpc_gateway_attachment</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "attachment_type",
+    "type": "string",
+    "description": "Used to identify if this resource is an Internet Gateway or Vpn Gateway Attachment"
+  },
+  {
+    "name": "vpc_id",
+    "type": "string",
+    "description": "The ID of the VPC."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcgatewayattachment.html"><code>AWS::EC2::VPCGatewayAttachment</code></a>.
 
@@ -69,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_gateway_attachments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_gateway_attachments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_gateway_attachments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_gateway_attachments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_gateway_attachments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_gateway_attachment</code>.
 ```sql
 SELECT
@@ -113,6 +159,20 @@ vpn_gateway_id
 FROM awscc.ec2.vpc_gateway_attachments
 WHERE region = 'us-east-1' AND data__Identifier = '<AttachmentType>|<VpcId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_gateway_attachments</code> in a region.
+```sql
+SELECT
+region,
+attachment_type,
+vpc_id
+FROM awscc.ec2.vpc_gateway_attachments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -181,6 +241,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.vpc_gateway_attachments
+SET data__PatchDocument = string('{{ {
+    "InternetGatewayId": internet_gateway_id,
+    "VpnGatewayId": vpn_gateway_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AttachmentType>|<VpcId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/vpc_gateway_attachments_list_only/index.md b/website/docs/services/ec2/vpc_gateway_attachments_list_only/index.md
deleted file mode 100644
index 957e029eb..000000000
--- a/website/docs/services/ec2/vpc_gateway_attachments_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: vpc_gateway_attachments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_gateway_attachments_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_gateway_attachments</code> in a region or regions, for all properties use <a href="/services/ec2/vpc_gateway_attachments/"><code>vpc_gateway_attachments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_gateway_attachments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::VPCGatewayAttachment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.vpc_gateway_attachments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "attachment_type",
-    "type": "string",
-    "description": "Used to identify if this resource is an Internet Gateway or Vpn Gateway Attachment"
-  },
-  {
-    "name": "vpc_id",
-    "type": "string",
-    "description": "The ID of the VPC."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_gateway_attachments</code> in a region.
-```sql
-SELECT
-region,
-attachment_type,
-vpc_id
-FROM awscc.ec2.vpc_gateway_attachments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_gateway_attachments_list_only</code> resource, see <a href="/services/ec2/vpc_gateway_attachments/#permissions"><code>vpc_gateway_attachments</code></a>
-
diff --git a/website/docs/services/ec2/vpc_peering_connections/index.md b/website/docs/services/ec2/vpc_peering_connections/index.md
index 6865a45d5..de3abdb5e 100644
--- a/website/docs/services/ec2/vpc_peering_connections/index.md
+++ b/website/docs/services/ec2/vpc_peering_connections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_peering_connection</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "peer_role_arn",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>vpc_peering_connection</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html"><code>AWS::EC2::VPCPeeringConnection</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_peering_connections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VpcId, PeerVpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_peering_connections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_peering_connections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_peering_connections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_peering_connections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_peering_connection</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.ec2.vpc_peering_connections
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_peering_connections</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ec2.vpc_peering_connections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -227,6 +281,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.vpc_peering_connections
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/vpc_peering_connections_list_only/index.md b/website/docs/services/ec2/vpc_peering_connections_list_only/index.md
deleted file mode 100644
index 4aae80bf7..000000000
--- a/website/docs/services/ec2/vpc_peering_connections_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpc_peering_connections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_peering_connections_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_peering_connections</code> in a region or regions, for all properties use <a href="/services/ec2/vpc_peering_connections/"><code>vpc_peering_connections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_peering_connections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EC2::VPCPeeringConnection</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.vpc_peering_connections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_peering_connections</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ec2.vpc_peering_connections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_peering_connections_list_only</code> resource, see <a href="/services/ec2/vpc_peering_connections/#permissions"><code>vpc_peering_connections</code></a>
-
diff --git a/website/docs/services/ec2/vpcdhcp_options_associations/index.md b/website/docs/services/ec2/vpcdhcp_options_associations/index.md
index 880f2d627..c7d1847e8 100644
--- a/website/docs/services/ec2/vpcdhcp_options_associations/index.md
+++ b/website/docs/services/ec2/vpcdhcp_options_associations/index.md
@@ -33,6 +33,35 @@ Creates, updates, deletes or gets a <code>vpcdhcp_options_association</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "dhcp_options_id",
+    "type": "string",
+    "description": "The ID of the DHCP options set, or default to associate no DHCP options with the VPC."
+  },
+  {
+    "name": "vpc_id",
+    "type": "string",
+    "description": "The ID of the VPC."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "dhcp_options_id",
@@ -50,6 +79,8 @@ Creates, updates, deletes or gets a <code>vpcdhcp_options_association</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcdhcpoptionsassociation.html"><code>AWS::EC2::VPCDHCPOptionsAssociation</code></a>.
 
@@ -59,31 +90,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpcdhcp_options_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VpcId, DhcpOptionsId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpcdhcp_options_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpcdhcp_options_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpcdhcp_options_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpcdhcp_options_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +129,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpcdhcp_options_association</code>.
 ```sql
 SELECT
@@ -101,6 +147,20 @@ vpc_id
 FROM awscc.ec2.vpcdhcp_options_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<DhcpOptionsId>|<VpcId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpcdhcp_options_associations</code> in a region.
+```sql
+SELECT
+region,
+dhcp_options_id,
+vpc_id
+FROM awscc.ec2.vpcdhcp_options_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -167,6 +227,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/vpcdhcp_options_associations_list_only/index.md b/website/docs/services/ec2/vpcdhcp_options_associations_list_only/index.md
deleted file mode 100644
index 6489bc901..000000000
--- a/website/docs/services/ec2/vpcdhcp_options_associations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: vpcdhcp_options_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpcdhcp_options_associations_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpcdhcp_options_associations</code> in a region or regions, for all properties use <a href="/services/ec2/vpcdhcp_options_associations/"><code>vpcdhcp_options_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpcdhcp_options_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Associates a set of DHCP options with a VPC, or associates no DHCP options with the VPC.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.vpcdhcp_options_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "dhcp_options_id",
-    "type": "string",
-    "description": "The ID of the DHCP options set, or default to associate no DHCP options with the VPC."
-  },
-  {
-    "name": "vpc_id",
-    "type": "string",
-    "description": "The ID of the VPC."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpcdhcp_options_associations</code> in a region.
-```sql
-SELECT
-region,
-dhcp_options_id,
-vpc_id
-FROM awscc.ec2.vpcdhcp_options_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpcdhcp_options_associations_list_only</code> resource, see <a href="/services/ec2/vpcdhcp_options_associations/#permissions"><code>vpcdhcp_options_associations</code></a>
-
diff --git a/website/docs/services/ec2/vpcs/index.md b/website/docs/services/ec2/vpcs/index.md
index 6e94cea99..64e2d7ce2 100644
--- a/website/docs/services/ec2/vpcs/index.md
+++ b/website/docs/services/ec2/vpcs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc</code> resource or lists <code>vpc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "vpc_id",
@@ -112,6 +121,23 @@ Creates, updates, deletes or gets a <code>vpc</code> resource or lists <code>vpc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "vpc_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html"><code>AWS::EC2::VPC</code></a>.
 
@@ -121,31 +147,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpcs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpcs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpcs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpcs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpcs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -154,6 +186,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc</code>.
 ```sql
 SELECT
@@ -173,6 +214,19 @@ tags
 FROM awscc.ec2.vpcs
 WHERE region = 'us-east-1' AND data__Identifier = '<VpcId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpcs</code> in a region.
+```sql
+SELECT
+region,
+vpc_id
+FROM awscc.ec2.vpcs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -271,6 +325,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.vpcs
+SET data__PatchDocument = string('{{ {
+    "InstanceTenancy": instance_tenancy,
+    "EnableDnsSupport": enable_dns_support,
+    "EnableDnsHostnames": enable_dns_hostnames,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<VpcId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/vpcs_list_only/index.md b/website/docs/services/ec2/vpcs_list_only/index.md
deleted file mode 100644
index fdbf972a5..000000000
--- a/website/docs/services/ec2/vpcs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpcs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpcs_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpcs</code> in a region or regions, for all properties use <a href="/services/ec2/vpcs/"><code>vpcs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpcs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a virtual private cloud (VPC).<br />To add an IPv6 CIDR block to the VPC, see &#91;AWS::EC2::VPCCidrBlock&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpccidrblock.html).<br />For more information, see &#91;Virtual private clouds (VPC)&#93;(https://docs.aws.amazon.com/vpc/latest/userguide/configure-your-vpc.html) in the &#42;Amazon VPC User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.vpcs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "vpc_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpcs</code> in a region.
-```sql
-SELECT
-region,
-vpc_id
-FROM awscc.ec2.vpcs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpcs_list_only</code> resource, see <a href="/services/ec2/vpcs/#permissions"><code>vpcs</code></a>
-
diff --git a/website/docs/services/ec2/vpn_connection_routes/index.md b/website/docs/services/ec2/vpn_connection_routes/index.md
index d9dc8dd0c..027df7681 100644
--- a/website/docs/services/ec2/vpn_connection_routes/index.md
+++ b/website/docs/services/ec2/vpn_connection_routes/index.md
@@ -33,6 +33,35 @@ Creates, updates, deletes or gets a <code>vpn_connection_route</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "destination_cidr_block",
+    "type": "string",
+    "description": "The CIDR block associated with the local subnet of the customer network."
+  },
+  {
+    "name": "vpn_connection_id",
+    "type": "string",
+    "description": "The ID of the VPN connection."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "destination_cidr_block",
@@ -50,6 +79,8 @@ Creates, updates, deletes or gets a <code>vpn_connection_route</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnectionroute.html"><code>AWS::EC2::VPNConnectionRoute</code></a>.
 
@@ -59,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpn_connection_routes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DestinationCidrBlock, VpnConnectionId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpn_connection_routes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpn_connection_routes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpn_connection_routes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpn_connection_route</code>.
 ```sql
 SELECT
@@ -96,6 +141,20 @@ vpn_connection_id
 FROM awscc.ec2.vpn_connection_routes
 WHERE region = 'us-east-1' AND data__Identifier = '<DestinationCidrBlock>|<VpnConnectionId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpn_connection_routes</code> in a region.
+```sql
+SELECT
+region,
+destination_cidr_block,
+vpn_connection_id
+FROM awscc.ec2.vpn_connection_routes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -162,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/vpn_connection_routes_list_only/index.md b/website/docs/services/ec2/vpn_connection_routes_list_only/index.md
deleted file mode 100644
index da953c717..000000000
--- a/website/docs/services/ec2/vpn_connection_routes_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: vpn_connection_routes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpn_connection_routes_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpn_connection_routes</code> in a region or regions, for all properties use <a href="/services/ec2/vpn_connection_routes/"><code>vpn_connection_routes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpn_connection_routes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a static route for a VPN connection between an existing virtual private gateway and a VPN customer gateway. The static route allows traffic to be routed from the virtual private gateway to the VPN customer gateway.<br />For more information, see &#91;&#93;(https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC&#95;VPN.html) in the &#42;User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.vpn_connection_routes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "destination_cidr_block",
-    "type": "string",
-    "description": "The CIDR block associated with the local subnet of the customer network."
-  },
-  {
-    "name": "vpn_connection_id",
-    "type": "string",
-    "description": "The ID of the VPN connection."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpn_connection_routes</code> in a region.
-```sql
-SELECT
-region,
-destination_cidr_block,
-vpn_connection_id
-FROM awscc.ec2.vpn_connection_routes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpn_connection_routes_list_only</code> resource, see <a href="/services/ec2/vpn_connection_routes/#permissions"><code>vpn_connection_routes</code></a>
-
diff --git a/website/docs/services/ec2/vpn_connections/index.md b/website/docs/services/ec2/vpn_connections/index.md
index 33887e582..54d3c1af4 100644
--- a/website/docs/services/ec2/vpn_connections/index.md
+++ b/website/docs/services/ec2/vpn_connections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpn_connection</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "remote_ipv6_network_cidr",
@@ -312,6 +321,23 @@ Creates, updates, deletes or gets a <code>vpn_connection</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "vpn_connection_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnection.html"><code>AWS::EC2::VPNConnection</code></a>.
 
@@ -321,31 +347,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpn_connections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, CustomerGatewayId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpn_connections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpn_connections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpn_connections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpn_connections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -354,6 +386,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpn_connection</code>.
 ```sql
 SELECT
@@ -378,6 +419,19 @@ tags
 FROM awscc.ec2.vpn_connections
 WHERE region = 'us-east-1' AND data__Identifier = '<VpnConnectionId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpn_connections</code> in a region.
+```sql
+SELECT
+region,
+vpn_connection_id
+FROM awscc.ec2.vpn_connections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -533,6 +587,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.vpn_connections
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<VpnConnectionId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/vpn_connections_list_only/index.md b/website/docs/services/ec2/vpn_connections_list_only/index.md
deleted file mode 100644
index f84ecd99d..000000000
--- a/website/docs/services/ec2/vpn_connections_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpn_connections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpn_connections_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpn_connections</code> in a region or regions, for all properties use <a href="/services/ec2/vpn_connections/"><code>vpn_connections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpn_connections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a VPN connection between a virtual private gateway and a VPN customer gateway or a transit gateway and a VPN customer gateway.<br />To specify a VPN connection between a transit gateway and customer gateway, use the &#96;&#96;TransitGatewayId&#96;&#96; and &#96;&#96;CustomerGatewayId&#96;&#96; properties.<br />To specify a VPN connection between a virtual private gateway and customer gateway, use the &#96;&#96;VpnGatewayId&#96;&#96; and &#96;&#96;CustomerGatewayId&#96;&#96; properties.<br />For more information, see &#91;&#93;(https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC&#95;VPN.html) in the &#42;User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.vpn_connections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "vpn_connection_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpn_connections</code> in a region.
-```sql
-SELECT
-region,
-vpn_connection_id
-FROM awscc.ec2.vpn_connections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpn_connections_list_only</code> resource, see <a href="/services/ec2/vpn_connections/#permissions"><code>vpn_connections</code></a>
-
diff --git a/website/docs/services/ec2/vpn_gateways/index.md b/website/docs/services/ec2/vpn_gateways/index.md
index cd97b1178..14445fd75 100644
--- a/website/docs/services/ec2/vpn_gateways/index.md
+++ b/website/docs/services/ec2/vpn_gateways/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpn_gateway</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "v_pn_gateway_id",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>vpn_gateway</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "v_pn_gateway_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpngateway.html"><code>AWS::EC2::VPNGateway</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpn_gateways</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpn_gateways</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpn_gateways</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpn_gateways_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpn_gateways</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpn_gateway</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ type
 FROM awscc.ec2.vpn_gateways
 WHERE region = 'us-east-1' AND data__Identifier = '<VPNGatewayId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpn_gateways</code> in a region.
+```sql
+SELECT
+region,
+v_pn_gateway_id
+FROM awscc.ec2.vpn_gateways_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -195,6 +249,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ec2.vpn_gateways
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<VPNGatewayId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ec2/vpn_gateways_list_only/index.md b/website/docs/services/ec2/vpn_gateways_list_only/index.md
deleted file mode 100644
index dcce7e7f1..000000000
--- a/website/docs/services/ec2/vpn_gateways_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpn_gateways_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpn_gateways_list_only
-  - ec2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpn_gateways</code> in a region or regions, for all properties use <a href="/services/ec2/vpn_gateways/"><code>vpn_gateways</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpn_gateways_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a virtual private gateway. A virtual private gateway is the endpoint on the VPC side of your VPN connection. You can create a virtual private gateway before creating the VPC itself.<br />For more information, see &#91;&#93;(https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC&#95;VPN.html) in the &#42;User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ec2.vpn_gateways_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "v_pn_gateway_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpn_gateways</code> in a region.
-```sql
-SELECT
-region,
-v_pn_gateway_id
-FROM awscc.ec2.vpn_gateways_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpn_gateways_list_only</code> resource, see <a href="/services/ec2/vpn_gateways/#permissions"><code>vpn_gateways</code></a>
-
diff --git a/website/docs/services/ecr/index.md b/website/docs/services/ecr/index.md
index 951c88b73..0ee1fb9dd 100644
--- a/website/docs/services/ecr/index.md
+++ b/website/docs/services/ecr/index.md
@@ -20,7 +20,7 @@ The ecr service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>14</b></span><br />
+<span>total resources:&nbsp;<b>7</b></span><br />
 </div>
 </div>
 
@@ -30,20 +30,13 @@ The ecr service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/ecr/public_repositories/">public_repositories</a><br />
-<a href="/services/ecr/public_repositories_list_only/">public_repositories_list_only</a><br />
 <a href="/services/ecr/pull_through_cache_rules/">pull_through_cache_rules</a><br />
-<a href="/services/ecr/pull_through_cache_rules_list_only/">pull_through_cache_rules_list_only</a><br />
 <a href="/services/ecr/registry_policies/">registry_policies</a><br />
-<a href="/services/ecr/registry_policies_list_only/">registry_policies_list_only</a><br />
 <a href="/services/ecr/registry_scanning_configurations/">registry_scanning_configurations</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/ecr/registry_scanning_configurations_list_only/">registry_scanning_configurations_list_only</a><br />
 <a href="/services/ecr/replication_configurations/">replication_configurations</a><br />
-<a href="/services/ecr/replication_configurations_list_only/">replication_configurations_list_only</a><br />
 <a href="/services/ecr/repositories/">repositories</a><br />
-<a href="/services/ecr/repositories_list_only/">repositories_list_only</a><br />
-<a href="/services/ecr/repository_creation_templates/">repository_creation_templates</a><br />
-<a href="/services/ecr/repository_creation_templates_list_only/">repository_creation_templates_list_only</a>
+<a href="/services/ecr/repository_creation_templates/">repository_creation_templates</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/ecr/public_repositories/index.md b/website/docs/services/ecr/public_repositories/index.md
index c8f0e270e..dff14028d 100644
--- a/website/docs/services/ecr/public_repositories/index.md
+++ b/website/docs/services/ecr/public_repositories/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>public_repository</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "repository_name",
@@ -104,6 +113,23 @@ Creates, updates, deletes or gets a <code>public_repository</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "repository_name",
+    "type": "string",
+    "description": "The name to use for the public repository. The repository name may be specified on its own (such as &#96;&#96;nginx-web-app&#96;&#96;) or it can be prepended with a namespace to group the repository into a category (such as &#96;&#96;project-a/nginx-web-app&#96;&#96;). If you don't specify a name, CFNlong generates a unique physical ID and uses that ID for the repository name. For more information, see &#91;Name Type&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-name.html).<br />If you specify a name, you cannot perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html"><code>AWS::ECR::PublicRepository</code></a>.
 
@@ -113,31 +139,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>public_repositories</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>public_repositories</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>public_repositories</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>public_repositories_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>public_repositories</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -146,6 +178,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>public_repository</code>.
 ```sql
 SELECT
@@ -158,6 +199,19 @@ tags
 FROM awscc.ecr.public_repositories
 WHERE region = 'us-east-1' AND data__Identifier = '<RepositoryName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>public_repositories</code> in a region.
+```sql
+SELECT
+region,
+repository_name
+FROM awscc.ecr.public_repositories_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -245,6 +299,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ecr.public_repositories
+SET data__PatchDocument = string('{{ {
+    "RepositoryPolicyText": repository_policy_text,
+    "RepositoryCatalogData": repository_catalog_data,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RepositoryName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ecr/public_repositories_list_only/index.md b/website/docs/services/ecr/public_repositories_list_only/index.md
deleted file mode 100644
index 6dad8f086..000000000
--- a/website/docs/services/ecr/public_repositories_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: public_repositories_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - public_repositories_list_only
-  - ecr
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>public_repositories</code> in a region or regions, for all properties use <a href="/services/ecr/public_repositories/"><code>public_repositories</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>public_repositories_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ECR::PublicRepository&#96;&#96; resource specifies an Amazon Elastic Container Registry Public (Amazon ECR Public) repository, where users can push and pull Docker images, Open Container Initiative (OCI) images, and OCI compatible artifacts. For more information, see &#91;Amazon ECR public repositories&#93;(https://docs.aws.amazon.com/AmazonECR/latest/public/public-repositories.html) in the &#42;Amazon ECR Public User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ecr.public_repositories_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "repository_name",
-    "type": "string",
-    "description": "The name to use for the public repository. The repository name may be specified on its own (such as &#96;&#96;nginx-web-app&#96;&#96;) or it can be prepended with a namespace to group the repository into a category (such as &#96;&#96;project-a/nginx-web-app&#96;&#96;). If you don't specify a name, CFNlong generates a unique physical ID and uses that ID for the repository name. For more information, see &#91;Name Type&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-name.html).<br />If you specify a name, you cannot perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>public_repositories</code> in a region.
-```sql
-SELECT
-region,
-repository_name
-FROM awscc.ecr.public_repositories_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>public_repositories_list_only</code> resource, see <a href="/services/ecr/public_repositories/#permissions"><code>public_repositories</code></a>
-
diff --git a/website/docs/services/ecr/pull_through_cache_rules/index.md b/website/docs/services/ecr/pull_through_cache_rules/index.md
index dfb10d316..2a2a198d1 100644
--- a/website/docs/services/ecr/pull_through_cache_rules/index.md
+++ b/website/docs/services/ecr/pull_through_cache_rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>pull_through_cache_rule</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ecr_repository_prefix",
@@ -70,6 +79,23 @@ Creates, updates, deletes or gets a <code>pull_through_cache_rule</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "ecr_repository_prefix",
+    "type": "string",
+    "description": "The Amazon ECR repository prefix associated with the pull through cache rule."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-pullthroughcacherule.html"><code>AWS::ECR::PullThroughCacheRule</code></a>.
 
@@ -79,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>pull_through_cache_rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>pull_through_cache_rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>pull_through_cache_rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>pull_through_cache_rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>pull_through_cache_rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>pull_through_cache_rule</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ upstream_repository_prefix
 FROM awscc.ecr.pull_through_cache_rules
 WHERE region = 'us-east-1' AND data__Identifier = '<EcrRepositoryPrefix>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>pull_through_cache_rules</code> in a region.
+```sql
+SELECT
+region,
+ecr_repository_prefix
+FROM awscc.ecr.pull_through_cache_rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -215,6 +269,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ecr/pull_through_cache_rules_list_only/index.md b/website/docs/services/ecr/pull_through_cache_rules_list_only/index.md
deleted file mode 100644
index f8d5a568a..000000000
--- a/website/docs/services/ecr/pull_through_cache_rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: pull_through_cache_rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - pull_through_cache_rules_list_only
-  - ecr
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>pull_through_cache_rules</code> in a region or regions, for all properties use <a href="/services/ecr/pull_through_cache_rules/"><code>pull_through_cache_rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>pull_through_cache_rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ECR::PullThroughCacheRule&#96;&#96; resource creates or updates a pull through cache rule. A pull through cache rule provides a way to cache images from an upstream registry in your Amazon ECR private registry.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ecr.pull_through_cache_rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "ecr_repository_prefix",
-    "type": "string",
-    "description": "The Amazon ECR repository prefix associated with the pull through cache rule."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>pull_through_cache_rules</code> in a region.
-```sql
-SELECT
-region,
-ecr_repository_prefix
-FROM awscc.ecr.pull_through_cache_rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>pull_through_cache_rules_list_only</code> resource, see <a href="/services/ecr/pull_through_cache_rules/#permissions"><code>pull_through_cache_rules</code></a>
-
diff --git a/website/docs/services/ecr/registry_policies/index.md b/website/docs/services/ecr/registry_policies/index.md
index d6d06081b..25cee737c 100644
--- a/website/docs/services/ecr/registry_policies/index.md
+++ b/website/docs/services/ecr/registry_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>registry_policy</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "registry_id",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>registry_policy</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "registry_id",
+    "type": "string",
+    "description": "The AWS account ID associated with the registry that contains the repository. If you do not specify a registry, the default registry is assumed."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-registrypolicy.html"><code>AWS::ECR::RegistryPolicy</code></a>.
 
@@ -59,31 +85,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>registry_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PolicyText, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>registry_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>registry_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>registry_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>registry_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +124,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>registry_policy</code>.
 ```sql
 SELECT
@@ -101,6 +142,19 @@ policy_text
 FROM awscc.ecr.registry_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<RegistryId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>registry_policies</code> in a region.
+```sql
+SELECT
+region,
+registry_id
+FROM awscc.ecr.registry_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -161,6 +215,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ecr.registry_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyText": policy_text
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RegistryId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ecr/registry_policies_list_only/index.md b/website/docs/services/ecr/registry_policies_list_only/index.md
deleted file mode 100644
index 3ab5898a4..000000000
--- a/website/docs/services/ecr/registry_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: registry_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - registry_policies_list_only
-  - ecr
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>registry_policies</code> in a region or regions, for all properties use <a href="/services/ecr/registry_policies/"><code>registry_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>registry_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ECR::RegistryPolicy&#96;&#96; resource creates or updates the permissions policy for a private registry.<br />A private registry policy is used to specify permissions for another AWS-account and is used when configuring cross-account replication. For more information, see &#91;Registry permissions&#93;(https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry-permissions.html) in the &#42;Amazon Elastic Container Registry User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ecr.registry_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "registry_id",
-    "type": "string",
-    "description": "The AWS account ID associated with the registry that contains the repository. If you do not specify a registry, the default registry is assumed."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>registry_policies</code> in a region.
-```sql
-SELECT
-region,
-registry_id
-FROM awscc.ecr.registry_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>registry_policies_list_only</code> resource, see <a href="/services/ecr/registry_policies/#permissions"><code>registry_policies</code></a>
-
diff --git a/website/docs/services/ecr/registry_scanning_configurations/index.md b/website/docs/services/ecr/registry_scanning_configurations/index.md
index ad7afc412..7b6bc6ef2 100644
--- a/website/docs/services/ecr/registry_scanning_configurations/index.md
+++ b/website/docs/services/ecr/registry_scanning_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>registry_scanning_configuration</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "rules",
@@ -79,6 +88,23 @@ Creates, updates, deletes or gets a <code>registry_scanning_configuration</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "registry_id",
+    "type": "string",
+    "description": "The AWS account ID associated with the registry that contains the repository. If you do not specify a registry, the default registry is assumed."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-registryscanningconfiguration.html"><code>AWS::ECR::RegistryScanningConfiguration</code></a>.
 
@@ -88,31 +114,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>registry_scanning_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Rules, ScanType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>registry_scanning_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>registry_scanning_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>registry_scanning_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>registry_scanning_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -121,6 +153,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>registry_scanning_configuration</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ registry_id
 FROM awscc.ecr.registry_scanning_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<RegistryId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>registry_scanning_configurations</code> in a region.
+```sql
+SELECT
+region,
+registry_id
+FROM awscc.ecr.registry_scanning_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -201,6 +255,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ecr.registry_scanning_configurations
+SET data__PatchDocument = string('{{ {
+    "Rules": rules,
+    "ScanType": scan_type
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RegistryId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ecr/registry_scanning_configurations_list_only/index.md b/website/docs/services/ecr/registry_scanning_configurations_list_only/index.md
deleted file mode 100644
index aa542be9e..000000000
--- a/website/docs/services/ecr/registry_scanning_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: registry_scanning_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - registry_scanning_configurations_list_only
-  - ecr
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>registry_scanning_configurations</code> in a region or regions, for all properties use <a href="/services/ecr/registry_scanning_configurations/"><code>registry_scanning_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>registry_scanning_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The scanning configuration for a private registry.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ecr.registry_scanning_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "registry_id",
-    "type": "string",
-    "description": "The AWS account ID associated with the registry that contains the repository. If you do not specify a registry, the default registry is assumed."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>registry_scanning_configurations</code> in a region.
-```sql
-SELECT
-region,
-registry_id
-FROM awscc.ecr.registry_scanning_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>registry_scanning_configurations_list_only</code> resource, see <a href="/services/ecr/registry_scanning_configurations/#permissions"><code>registry_scanning_configurations</code></a>
-
diff --git a/website/docs/services/ecr/replication_configurations/index.md b/website/docs/services/ecr/replication_configurations/index.md
index 87103d635..4bc5980f0 100644
--- a/website/docs/services/ecr/replication_configurations/index.md
+++ b/website/docs/services/ecr/replication_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>replication_configuration</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "replication_configuration",
@@ -57,6 +66,23 @@ Creates, updates, deletes or gets a <code>replication_configuration</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "registry_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-replicationconfiguration.html"><code>AWS::ECR::ReplicationConfiguration</code></a>.
 
@@ -66,31 +92,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>replication_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ReplicationConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>replication_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>replication_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>replication_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>replication_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -99,6 +131,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>replication_configuration</code>.
 ```sql
 SELECT
@@ -108,6 +149,19 @@ registry_id
 FROM awscc.ecr.replication_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<RegistryId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>replication_configurations</code> in a region.
+```sql
+SELECT
+region,
+registry_id
+FROM awscc.ecr.replication_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -169,6 +223,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ecr.replication_configurations
+SET data__PatchDocument = string('{{ {
+    "ReplicationConfiguration": replication_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RegistryId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ecr/replication_configurations_list_only/index.md b/website/docs/services/ecr/replication_configurations_list_only/index.md
deleted file mode 100644
index a601aa9a8..000000000
--- a/website/docs/services/ecr/replication_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: replication_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - replication_configurations_list_only
-  - ecr
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>replication_configurations</code> in a region or regions, for all properties use <a href="/services/ecr/replication_configurations/"><code>replication_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>replication_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ECR::ReplicationConfiguration&#96;&#96; resource creates or updates the replication configuration for a private registry. The first time a replication configuration is applied to a private registry, a service-linked IAM role is created in your account for the replication process. For more information, see &#91;Using Service-Linked Roles for Amazon ECR&#93;(https://docs.aws.amazon.com/AmazonECR/latest/userguide/using-service-linked-roles.html) in the &#42;Amazon Elastic Container Registry User Guide&#42;.<br />When configuring cross-account replication, the destination account must grant the source account permission to replicate. This permission is controlled using a private registry permissions policy. For more information, see &#96;&#96;AWS::ECR::RegistryPolicy&#96;&#96;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ecr.replication_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "registry_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>replication_configurations</code> in a region.
-```sql
-SELECT
-region,
-registry_id
-FROM awscc.ecr.replication_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>replication_configurations_list_only</code> resource, see <a href="/services/ecr/replication_configurations/#permissions"><code>replication_configurations</code></a>
-
diff --git a/website/docs/services/ecr/repositories/index.md b/website/docs/services/ecr/repositories/index.md
index 57cbc8675..d450c9c67 100644
--- a/website/docs/services/ecr/repositories/index.md
+++ b/website/docs/services/ecr/repositories/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>repository</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "empty_on_delete",
@@ -150,6 +159,23 @@ Creates, updates, deletes or gets a <code>repository</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "repository_name",
+    "type": "string",
+    "description": "The name to use for the repository. The repository name may be specified on its own (such as &#96;&#96;nginx-web-app&#96;&#96;) or it can be prepended with a namespace to group the repository into a category (such as &#96;&#96;project-a/nginx-web-app&#96;&#96;). If you don't specify a name, CFNlong generates a unique physical ID and uses that ID for the repository name. For more information, see &#91;Name type&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-name.html).<br />The repository name must start with a letter and can only contain lowercase letters, numbers, hyphens, underscores, and forward slashes.<br />If you specify a name, you cannot perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html"><code>AWS::ECR::Repository</code></a>.
 
@@ -159,31 +185,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>repositories</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>repositories</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>repositories</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>repositories_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>repositories</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -192,6 +224,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>repository</code>.
 ```sql
 SELECT
@@ -210,6 +251,19 @@ encryption_configuration
 FROM awscc.ecr.repositories
 WHERE region = 'us-east-1' AND data__Identifier = '<RepositoryName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>repositories</code> in a region.
+```sql
+SELECT
+region,
+repository_name
+FROM awscc.ecr.repositories_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -327,6 +381,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ecr.repositories
+SET data__PatchDocument = string('{{ {
+    "EmptyOnDelete": empty_on_delete,
+    "LifecyclePolicy": lifecycle_policy,
+    "RepositoryPolicyText": repository_policy_text,
+    "Tags": tags,
+    "ImageTagMutability": image_tag_mutability,
+    "ImageTagMutabilityExclusionFilters": image_tag_mutability_exclusion_filters,
+    "ImageScanningConfiguration": image_scanning_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RepositoryName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ecr/repositories_list_only/index.md b/website/docs/services/ecr/repositories_list_only/index.md
deleted file mode 100644
index bb54c735f..000000000
--- a/website/docs/services/ecr/repositories_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: repositories_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - repositories_list_only
-  - ecr
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>repositories</code> in a region or regions, for all properties use <a href="/services/ecr/repositories/"><code>repositories</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>repositories_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ECR::Repository&#96;&#96; resource specifies an Amazon Elastic Container Registry (Amazon ECR) repository, where users can push and pull Docker images, Open Container Initiative (OCI) images, and OCI compatible artifacts. For more information, see &#91;Amazon ECR private repositories&#93;(https://docs.aws.amazon.com/AmazonECR/latest/userguide/Repositories.html) in the &#42;Amazon ECR User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ecr.repositories_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "repository_name",
-    "type": "string",
-    "description": "The name to use for the repository. The repository name may be specified on its own (such as &#96;&#96;nginx-web-app&#96;&#96;) or it can be prepended with a namespace to group the repository into a category (such as &#96;&#96;project-a/nginx-web-app&#96;&#96;). If you don't specify a name, CFNlong generates a unique physical ID and uses that ID for the repository name. For more information, see &#91;Name type&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-name.html).<br />The repository name must start with a letter and can only contain lowercase letters, numbers, hyphens, underscores, and forward slashes.<br />If you specify a name, you cannot perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>repositories</code> in a region.
-```sql
-SELECT
-region,
-repository_name
-FROM awscc.ecr.repositories_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>repositories_list_only</code> resource, see <a href="/services/ecr/repositories/#permissions"><code>repositories</code></a>
-
diff --git a/website/docs/services/ecr/repository_creation_templates/index.md b/website/docs/services/ecr/repository_creation_templates/index.md
index a97eac9ac..c5b866334 100644
--- a/website/docs/services/ecr/repository_creation_templates/index.md
+++ b/website/docs/services/ecr/repository_creation_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>repository_creation_template</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "prefix",
@@ -136,6 +145,23 @@ Creates, updates, deletes or gets a <code>repository_creation_template</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "prefix",
+    "type": "string",
+    "description": "The repository namespace prefix associated with the repository creation template."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repositorycreationtemplate.html"><code>AWS::ECR::RepositoryCreationTemplate</code></a>.
 
@@ -145,31 +171,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>repository_creation_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Prefix, AppliedFor, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>repository_creation_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>repository_creation_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>repository_creation_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>repository_creation_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -178,6 +210,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>repository_creation_template</code>.
 ```sql
 SELECT
@@ -197,6 +238,19 @@ updated_at
 FROM awscc.ecr.repository_creation_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<Prefix>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>repository_creation_templates</code> in a region.
+```sql
+SELECT
+region,
+prefix
+FROM awscc.ecr.repository_creation_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -302,6 +356,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ecr.repository_creation_templates
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "ImageTagMutability": image_tag_mutability,
+    "ImageTagMutabilityExclusionFilters": image_tag_mutability_exclusion_filters,
+    "RepositoryPolicy": repository_policy,
+    "LifecyclePolicy": lifecycle_policy,
+    "EncryptionConfiguration": encryption_configuration,
+    "ResourceTags": resource_tags,
+    "AppliedFor": applied_for,
+    "CustomRoleArn": custom_role_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Prefix>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ecr/repository_creation_templates_list_only/index.md b/website/docs/services/ecr/repository_creation_templates_list_only/index.md
deleted file mode 100644
index 041713e91..000000000
--- a/website/docs/services/ecr/repository_creation_templates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: repository_creation_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - repository_creation_templates_list_only
-  - ecr
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>repository_creation_templates</code> in a region or regions, for all properties use <a href="/services/ecr/repository_creation_templates/"><code>repository_creation_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>repository_creation_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The details of the repository creation template associated with the request.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ecr.repository_creation_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "prefix",
-    "type": "string",
-    "description": "The repository namespace prefix associated with the repository creation template."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>repository_creation_templates</code> in a region.
-```sql
-SELECT
-region,
-prefix
-FROM awscc.ecr.repository_creation_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>repository_creation_templates_list_only</code> resource, see <a href="/services/ecr/repository_creation_templates/#permissions"><code>repository_creation_templates</code></a>
-
diff --git a/website/docs/services/ecs/cluster_capacity_provider_associations/index.md b/website/docs/services/ecs/cluster_capacity_provider_associations/index.md
index eeb35fdb4..962dcb8d1 100644
--- a/website/docs/services/ecs/cluster_capacity_provider_associations/index.md
+++ b/website/docs/services/ecs/cluster_capacity_provider_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cluster_capacity_provider_association<
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "default_capacity_provider_strategy",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>cluster_capacity_provider_association<
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster",
+    "type": "string",
+    "description": "The name of the cluster"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-clustercapacityproviderassociation.html"><code>AWS::ECS::ClusterCapacityProviderAssociations</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cluster_capacity_provider_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CapacityProviders, Cluster, DefaultCapacityProviderStrategy, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cluster_capacity_provider_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cluster_capacity_provider_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cluster_capacity_provider_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cluster_capacity_provider_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cluster_capacity_provider_association</code>.
 ```sql
 SELECT
@@ -124,6 +165,19 @@ cluster
 FROM awscc.ecs.cluster_capacity_provider_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<Cluster>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cluster_capacity_provider_associations</code> in a region.
+```sql
+SELECT
+region,
+cluster
+FROM awscc.ecs.cluster_capacity_provider_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -200,6 +254,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ecs.cluster_capacity_provider_associations
+SET data__PatchDocument = string('{{ {
+    "DefaultCapacityProviderStrategy": default_capacity_provider_strategy,
+    "CapacityProviders": capacity_providers
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Cluster>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ecs/cluster_capacity_provider_associations_list_only/index.md b/website/docs/services/ecs/cluster_capacity_provider_associations_list_only/index.md
deleted file mode 100644
index 4448a1843..000000000
--- a/website/docs/services/ecs/cluster_capacity_provider_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: cluster_capacity_provider_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cluster_capacity_provider_associations_list_only
-  - ecs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cluster_capacity_provider_associations</code> in a region or regions, for all properties use <a href="/services/ecs/cluster_capacity_provider_associations/"><code>cluster_capacity_provider_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cluster_capacity_provider_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Associate a set of ECS Capacity Providers with a specified ECS Cluster</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ecs.cluster_capacity_provider_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cluster",
-    "type": "string",
-    "description": "The name of the cluster"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cluster_capacity_provider_associations</code> in a region.
-```sql
-SELECT
-region,
-cluster
-FROM awscc.ecs.cluster_capacity_provider_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cluster_capacity_provider_associations_list_only</code> resource, see <a href="/services/ecs/cluster_capacity_provider_associations/#permissions"><code>cluster_capacity_provider_associations</code></a>
-
diff --git a/website/docs/services/ecs/index.md b/website/docs/services/ecs/index.md
index 9924bc1e3..2f4c38be9 100644
--- a/website/docs/services/ecs/index.md
+++ b/website/docs/services/ecs/index.md
@@ -20,7 +20,7 @@ The ecs service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>5</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,11 @@ The ecs service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/ecs/cluster_capacity_provider_associations/">cluster_capacity_provider_associations</a><br />
-<a href="/services/ecs/cluster_capacity_provider_associations_list_only/">cluster_capacity_provider_associations_list_only</a><br />
 <a href="/services/ecs/primary_task_sets/">primary_task_sets</a><br />
 <a href="/services/ecs/services/">services</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/ecs/services_list_only/">services_list_only</a><br />
 <a href="/services/ecs/task_definitions/">task_definitions</a><br />
-<a href="/services/ecs/task_definitions_list_only/">task_definitions_list_only</a><br />
 <a href="/services/ecs/task_sets/">task_sets</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/ecs/primary_task_sets/index.md b/website/docs/services/ecs/primary_task_sets/index.md
index 6dffbfd04..0efe857d4 100644
--- a/website/docs/services/ecs/primary_task_sets/index.md
+++ b/website/docs/services/ecs/primary_task_sets/index.md
@@ -169,6 +169,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ecs.primary_task_sets
+SET data__PatchDocument = string('{{ {
+    "TaskSetId": task_set_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Cluster>|<Service>';
+```
+
+
 ## Permissions
 
 To operate on the <code>primary_task_sets</code> resource, the following permissions are required:
diff --git a/website/docs/services/ecs/services/index.md b/website/docs/services/ecs/services/index.md
index 18ed836b3..bff870573 100644
--- a/website/docs/services/ecs/services/index.md
+++ b/website/docs/services/ecs/services/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>service</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "platform_version",
@@ -630,6 +639,28 @@ Creates, updates, deletes or gets a <code>service</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "service_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "cluster",
+    "type": "string",
+    "description": "The short name or full Amazon Resource Name (ARN) of the cluster that you run your service on. If you do not specify a cluster, the default cluster is assumed."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html"><code>AWS::ECS::Service</code></a>.
 
@@ -639,31 +670,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>services</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>services</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>services</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>services_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>services</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -672,6 +709,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>service</code>.
 ```sql
 SELECT
@@ -707,6 +753,20 @@ deployment_configuration
 FROM awscc.ecs.services
 WHERE region = 'us-east-1' AND data__Identifier = '<ServiceArn>|<Cluster>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>services</code> in a region.
+```sql
+SELECT
+region,
+service_arn,
+cluster
+FROM awscc.ecs.services_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1007,6 +1067,39 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ecs.services
+SET data__PatchDocument = string('{{ {
+    "PlatformVersion": platform_version,
+    "PropagateTags": propagate_tags,
+    "PlacementStrategies": placement_strategies,
+    "ServiceRegistries": service_registries,
+    "VolumeConfigurations": volume_configurations,
+    "CapacityProviderStrategy": capacity_provider_strategy,
+    "AvailabilityZoneRebalancing": availability_zone_rebalancing,
+    "NetworkConfiguration": network_configuration,
+    "Tags": tags,
+    "ForceNewDeployment": force_new_deployment,
+    "HealthCheckGracePeriodSeconds": health_check_grace_period_seconds,
+    "EnableECSManagedTags": enable_ecs_managed_tags,
+    "EnableExecuteCommand": enable_execute_command,
+    "PlacementConstraints": placement_constraints,
+    "LoadBalancers": load_balancers,
+    "ServiceConnectConfiguration": service_connect_configuration,
+    "DesiredCount": desired_count,
+    "VpcLatticeConfigurations": vpc_lattice_configurations,
+    "DeploymentController": deployment_controller,
+    "TaskDefinition": task_definition,
+    "DeploymentConfiguration": deployment_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ServiceArn>|<Cluster>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ecs/services_list_only/index.md b/website/docs/services/ecs/services_list_only/index.md
deleted file mode 100644
index 743635f20..000000000
--- a/website/docs/services/ecs/services_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: services_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - services_list_only
-  - ecs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>services</code> in a region or regions, for all properties use <a href="/services/ecs/services/"><code>services</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>services_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::ECS::Service&#96;&#96; resource creates an Amazon Elastic Container Service (Amazon ECS) service that runs and maintains the requested number of tasks and associated load balancers.<br />The stack update fails if you change any properties that require replacement and at least one ECS Service Connect &#96;&#96;ServiceConnectConfiguration&#96;&#96; property is configured. This is because AWS CloudFormation creates the replacement service first, but each &#96;&#96;ServiceConnectService&#96;&#96; must have a name that is unique in the namespace.<br />Starting April 15, 2023, AWS; will not onboard new customers to Amazon Elastic Inference (EI), and will help current customers migrate their workloads to options that offer better price and performance. After April 15, 2023, new customers will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, ECS, or EC2. However, customers who have used Amazon EI at least once during the past 30-day period are considered current customers and will be able to continue using the service. <br />On June 12, 2025, Amazon ECS launched support for updating capacity provider configuration for ECS services. With this launch, ECS also aligned the CFN update behavior for &#96;&#96;CapacityProviderStrategy&#96;&#96; parameter with the standard practice. For more information, see &#91;adds support for updating capacity provider configuration for ECS services&#93;(https://docs.aws.amazon.com/about-aws/whats-new/2025/05/amazon-ecs-capacity-provider-configuration-ecs/). Previously ECS ignored the &#96;&#96;CapacityProviderStrategy&#96;&#96; property if it was set to an empty list for example, &#96;&#96;&#91;&#93;&#96;&#96; in CFN, because updating capacity provider configuration was not supported. Now, with support for capacity provider updates, customers can remove capacity providers from a service by passing an empty list. When you specify an empty list (&#96;&#96;&#91;&#93;&#96;&#96;) for the &#96;&#96;CapacityProviderStrategy&#96;&#96; property in your CFN template, ECS will remove any capacity providers associated with the service, as follows:<br />+ For services created with a capacity provider strategy after the launch:<br />+ If there's a cluster default strategy set, the service will revert to using that default strategy.<br />+ If no cluster default strategy exists, you will receive the following error:<br />No launch type to fall back to for empty capacity provider strategy. Your service was not created with a launch type.<br /><br />+ For services created with a capacity provider strategy prior to the launch:<br />+ If &#96;&#96;CapacityProviderStrategy&#96;&#96; had &#96;&#96;FARGATE&#95;SPOT&#96;&#96; or &#96;&#96;FARGATE&#96;&#96; capacity providers, the launch type will be updated to &#96;&#96;FARGATE&#96;&#96; and the capacity provider will be removed.<br />+ If the strategy included Auto Scaling group capacity providers, the service will revert to EC2 launch type, and the Auto Scaling group capacity providers will not be used.<br /><br /><br />Recommended Actions<br />If you are currently using &#96;&#96;CapacityProviderStrategy: &#91;&#93;&#96;&#96; in your CFN templates, you should take one of the following actions:<br />+ If you do not intend to update the Capacity Provider Strategy:<br />+ Remove the &#96;&#96;CapacityProviderStrategy&#96;&#96; property entirely from your CFN template<br />+ Alternatively, use &#96;&#96;!Ref ::NoValue&#96;&#96; for the &#96;&#96;CapacityProviderStrategy&#96;&#96; property in your template<br /><br />+ If you intend to maintain or update the Capacity Provider Strategy, specify the actual Capacity Provider Strategy for the service in your CFN template.<br /><br />If your CFN template had an empty list (&#91;&#93;) for &#96;&#96;CapacityProviderStrategy&#96;&#96; prior to the aforementioned launch on June 12, and you are using the same template with &#96;&#96;CapacityProviderStrategy: &#91;&#93;&#96;&#96;, you might encounter the following error:<br />Invalid request provided: When switching from launch type to capacity provider strategy on an existing service, or making a change to a capacity provider strategy on a service that is already using one, you must force a new deployment. (Service: Ecs, Status Code: 400, Request ID: xxx) (SDK Attempt Count: 1)" (RequestToken: xxx HandlerErrorCode: InvalidRequest) <br />Note that CFN automatically initiates a new deployment when it detects a parameter change, but customers cannot choose to force a deployment through CFN. This is an invalid input scenario that requires one of the remediation actions listed above.<br />If you are experiencing active production issues related to this change, contact AWS Support or your Technical Account Manager.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ecs.services_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "service_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "cluster",
-    "type": "string",
-    "description": "The short name or full Amazon Resource Name (ARN) of the cluster that you run your service on. If you do not specify a cluster, the default cluster is assumed."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>services</code> in a region.
-```sql
-SELECT
-region,
-service_arn,
-cluster
-FROM awscc.ecs.services_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>services_list_only</code> resource, see <a href="/services/ecs/services/#permissions"><code>services</code></a>
-
diff --git a/website/docs/services/ecs/task_definitions/index.md b/website/docs/services/ecs/task_definitions/index.md
index 48d88470a..06e9f796d 100644
--- a/website/docs/services/ecs/task_definitions/index.md
+++ b/website/docs/services/ecs/task_definitions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>task_definition</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "task_role_arn",
@@ -890,6 +899,23 @@ Creates, updates, deletes or gets a <code>task_definition</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "task_definition_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html"><code>AWS::ECS::TaskDefinition</code></a>.
 
@@ -899,31 +925,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>task_definitions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>task_definitions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>task_definitions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>task_definitions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>task_definitions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -932,6 +964,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>task_definition</code>.
 ```sql
 SELECT
@@ -958,6 +999,19 @@ task_definition_arn
 FROM awscc.ecs.task_definitions
 WHERE region = 'us-east-1' AND data__Identifier = '<TaskDefinitionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>task_definitions</code> in a region.
+```sql
+SELECT
+region,
+task_definition_arn
+FROM awscc.ecs.task_definitions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1271,6 +1325,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ecs.task_definitions
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TaskDefinitionArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ecs/task_definitions_list_only/index.md b/website/docs/services/ecs/task_definitions_list_only/index.md
deleted file mode 100644
index 2c01cd449..000000000
--- a/website/docs/services/ecs/task_definitions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: task_definitions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - task_definitions_list_only
-  - ecs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>task_definitions</code> in a region or regions, for all properties use <a href="/services/ecs/task_definitions/"><code>task_definitions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>task_definitions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Registers a new task definition from the supplied &#96;&#96;family&#96;&#96; and &#96;&#96;containerDefinitions&#96;&#96;. Optionally, you can add data volumes to your containers with the &#96;&#96;volumes&#96;&#96; parameter. For more information about task definition parameters and defaults, see &#91;Amazon ECS Task Definitions&#93;(https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task&#95;defintions.html) in the &#42;Amazon Elastic Container Service Developer Guide&#42;.<br />You can specify a role for your task with the &#96;&#96;taskRoleArn&#96;&#96; parameter. When you specify a role for a task, its containers can then use the latest versions of the CLI or SDKs to make API requests to the AWS services that are specified in the policy that's associated with the role. For more information, see &#91;IAM Roles for Tasks&#93;(https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html) in the &#42;Amazon Elastic Container Service Developer Guide&#42;.<br />You can specify a Docker networking mode for the containers in your task definition with the &#96;&#96;networkMode&#96;&#96; parameter. If you specify the &#96;&#96;awsvpc&#96;&#96; network mode, the task is allocated an elastic network interface, and you must specify a &#91;NetworkConfiguration&#93;(https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API&#95;NetworkConfiguration.html) when you create a service or run a task with the task definition. For more information, see &#91;Task Networking&#93;(https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-networking.html) in the &#42;Amazon Elastic Container Service Developer Guide&#42;.<br />In the following example or examples, the Authorization header contents (&#96;&#96;AUTHPARAMS&#96;&#96;) must be replaced with an AWS Signature Version 4 signature. For more information, see &#91;Signature Version 4 Signing Process&#93;(https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html) in the &#42;General Reference&#42;.<br />You only need to learn how to sign HTTP requests if you intend to create them manually. When you use the &#91;&#93;(https://docs.aws.amazon.com/cli/) or one of the &#91;SDKs&#93;(https://docs.aws.amazon.com/tools/) to make requests to AWS, these tools automatically sign the requests for you, with the access key that you specify when you configure the tools. When you use these tools, you don't have to sign requests yourself.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ecs.task_definitions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "task_definition_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>task_definitions</code> in a region.
-```sql
-SELECT
-region,
-task_definition_arn
-FROM awscc.ecs.task_definitions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>task_definitions_list_only</code> resource, see <a href="/services/ecs/task_definitions/#permissions"><code>task_definitions</code></a>
-
diff --git a/website/docs/services/ecs/task_sets/index.md b/website/docs/services/ecs/task_sets/index.md
index 8b8843c31..71f159953 100644
--- a/website/docs/services/ecs/task_sets/index.md
+++ b/website/docs/services/ecs/task_sets/index.md
@@ -394,6 +394,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ecs.task_sets
+SET data__PatchDocument = string('{{ {
+    "Scale": scale,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Cluster>|<Service>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/efs/access_points/index.md b/website/docs/services/efs/access_points/index.md
index 6552e64c9..9d66cce04 100644
--- a/website/docs/services/efs/access_points/index.md
+++ b/website/docs/services/efs/access_points/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>access_point</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "access_point_id",
@@ -133,6 +142,23 @@ Creates, updates, deletes or gets an <code>access_point</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "access_point_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-accesspoint.html"><code>AWS::EFS::AccessPoint</code></a>.
 
@@ -142,31 +168,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FileSystemId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>access_points_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -175,6 +207,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>access_point</code>.
 ```sql
 SELECT
@@ -189,6 +230,19 @@ root_directory
 FROM awscc.efs.access_points
 WHERE region = 'us-east-1' AND data__Identifier = '<AccessPointId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>access_points</code> in a region.
+```sql
+SELECT
+region,
+access_point_id
+FROM awscc.efs.access_points_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -276,6 +330,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.efs.access_points
+SET data__PatchDocument = string('{{ {
+    "AccessPointTags": access_point_tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccessPointId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/efs/access_points_list_only/index.md b/website/docs/services/efs/access_points_list_only/index.md
deleted file mode 100644
index 8927dc0a8..000000000
--- a/website/docs/services/efs/access_points_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: access_points_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - access_points_list_only
-  - efs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>access_points</code> in a region or regions, for all properties use <a href="/services/efs/access_points/"><code>access_points</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>access_points_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::EFS::AccessPoint&#96;&#96; resource creates an EFS access point. An access point is an application-specific view into an EFS file system that applies an operating system user and group, and a file system path, to any file system request made through the access point. The operating system user and group override any identity information provided by the NFS client. The file system path is exposed as the access point's root directory. Applications using the access point can only access data in its own directory and below. To learn more, see &#91;Mounting a file system using EFS access points&#93;(https://docs.aws.amazon.com/efs/latest/ug/efs-access-points.html).<br />This operation requires permissions for the &#96;&#96;elasticfilesystem:CreateAccessPoint&#96;&#96; action.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.efs.access_points_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "access_point_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>access_points</code> in a region.
-```sql
-SELECT
-region,
-access_point_id
-FROM awscc.efs.access_points_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>access_points_list_only</code> resource, see <a href="/services/efs/access_points/#permissions"><code>access_points</code></a>
-
diff --git a/website/docs/services/efs/file_systems/index.md b/website/docs/services/efs/file_systems/index.md
index 841297a41..decc826cd 100644
--- a/website/docs/services/efs/file_systems/index.md
+++ b/website/docs/services/efs/file_systems/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>file_system</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "file_system_id",
@@ -202,6 +211,23 @@ Creates, updates, deletes or gets a <code>file_system</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "file_system_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html"><code>AWS::EFS::FileSystem</code></a>.
 
@@ -211,31 +237,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>file_systems</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>file_systems</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>file_systems</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>file_systems_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>file_systems</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -244,6 +276,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>file_system</code>.
 ```sql
 SELECT
@@ -266,6 +307,19 @@ replication_configuration
 FROM awscc.efs.file_systems
 WHERE region = 'us-east-1' AND data__Identifier = '<FileSystemId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>file_systems</code> in a region.
+```sql
+SELECT
+region,
+file_system_id
+FROM awscc.efs.file_systems_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -413,6 +467,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.efs.file_systems
+SET data__PatchDocument = string('{{ {
+    "FileSystemTags": file_system_tags,
+    "LifecyclePolicies": lifecycle_policies,
+    "FileSystemProtection": file_system_protection,
+    "ProvisionedThroughputInMibps": provisioned_throughput_in_mibps,
+    "ThroughputMode": throughput_mode,
+    "FileSystemPolicy": file_system_policy,
+    "BypassPolicyLockoutSafetyCheck": bypass_policy_lockout_safety_check,
+    "BackupPolicy": backup_policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FileSystemId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/efs/file_systems_list_only/index.md b/website/docs/services/efs/file_systems_list_only/index.md
deleted file mode 100644
index f7f91669e..000000000
--- a/website/docs/services/efs/file_systems_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: file_systems_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - file_systems_list_only
-  - efs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>file_systems</code> in a region or regions, for all properties use <a href="/services/efs/file_systems/"><code>file_systems</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>file_systems_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::EFS::FileSystem&#96;&#96; resource creates a new, empty file system in EFSlong (EFS). You must create a mount target (&#91;AWS::EFS::MountTarget&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-mounttarget.html)) to mount your EFS file system on an EC2 or other AWS cloud compute resource.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.efs.file_systems_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "file_system_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>file_systems</code> in a region.
-```sql
-SELECT
-region,
-file_system_id
-FROM awscc.efs.file_systems_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>file_systems_list_only</code> resource, see <a href="/services/efs/file_systems/#permissions"><code>file_systems</code></a>
-
diff --git a/website/docs/services/efs/index.md b/website/docs/services/efs/index.md
index 4f7700201..1aa59803f 100644
--- a/website/docs/services/efs/index.md
+++ b/website/docs/services/efs/index.md
@@ -20,7 +20,7 @@ The efs service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The efs service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/efs/access_points/">access_points</a><br />
-<a href="/services/efs/access_points_list_only/">access_points_list_only</a><br />
 <a href="/services/efs/file_systems/">file_systems</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/efs/file_systems_list_only/">file_systems_list_only</a><br />
-<a href="/services/efs/mount_targets/">mount_targets</a><br />
-<a href="/services/efs/mount_targets_list_only/">mount_targets_list_only</a>
+<a href="/services/efs/mount_targets/">mount_targets</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/efs/mount_targets/index.md b/website/docs/services/efs/mount_targets/index.md
index 94bebbe64..281f776c1 100644
--- a/website/docs/services/efs/mount_targets/index.md
+++ b/website/docs/services/efs/mount_targets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>mount_target</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -75,6 +84,23 @@ Creates, updates, deletes or gets a <code>mount_target</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-mounttarget.html"><code>AWS::EFS::MountTarget</code></a>.
 
@@ -84,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>mount_targets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FileSystemId, SecurityGroups, SubnetId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>mount_targets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>mount_targets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>mount_targets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>mount_targets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>mount_target</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ subnet_id
 FROM awscc.efs.mount_targets
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>mount_targets</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.efs.mount_targets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -216,6 +270,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.efs.mount_targets
+SET data__PatchDocument = string('{{ {
+    "SecurityGroups": security_groups
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/efs/mount_targets_list_only/index.md b/website/docs/services/efs/mount_targets_list_only/index.md
deleted file mode 100644
index d08948128..000000000
--- a/website/docs/services/efs/mount_targets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: mount_targets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - mount_targets_list_only
-  - efs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>mount_targets</code> in a region or regions, for all properties use <a href="/services/efs/mount_targets/"><code>mount_targets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>mount_targets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::EFS::MountTarget&#96;&#96; resource is an Amazon EFS resource that creates a mount target for an EFS file system. You can then mount the file system on Amazon EC2 instances or other resources by using the mount target.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.efs.mount_targets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>mount_targets</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.efs.mount_targets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>mount_targets_list_only</code> resource, see <a href="/services/efs/mount_targets/#permissions"><code>mount_targets</code></a>
-
diff --git a/website/docs/services/eks/access_entries/index.md b/website/docs/services/eks/access_entries/index.md
index 92da30b89..cfc1de6c7 100644
--- a/website/docs/services/eks/access_entries/index.md
+++ b/website/docs/services/eks/access_entries/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>access_entry</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cluster_name",
@@ -116,6 +125,28 @@ Creates, updates, deletes or gets an <code>access_entry</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_name",
+    "type": "string",
+    "description": "The cluster that the access entry is created for."
+  },
+  {
+    "name": "principal_arn",
+    "type": "string",
+    "description": "The principal ARN that the access entry is created for."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-accessentry.html"><code>AWS::EKS::AccessEntry</code></a>.
 
@@ -125,31 +156,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>access_entries</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PrincipalArn, ClusterName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>access_entries</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>access_entries</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>access_entries_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>access_entries</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -158,6 +195,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>access_entry</code>.
 ```sql
 SELECT
@@ -173,6 +219,20 @@ type
 FROM awscc.eks.access_entries
 WHERE region = 'us-east-1' AND data__Identifier = '<PrincipalArn>|<ClusterName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>access_entries</code> in a region.
+```sql
+SELECT
+region,
+principal_arn,
+cluster_name
+FROM awscc.eks.access_entries_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -267,6 +327,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.eks.access_entries
+SET data__PatchDocument = string('{{ {
+    "Username": username,
+    "Tags": tags,
+    "KubernetesGroups": kubernetes_groups,
+    "AccessPolicies": access_policies
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PrincipalArn>|<ClusterName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/eks/access_entries_list_only/index.md b/website/docs/services/eks/access_entries_list_only/index.md
deleted file mode 100644
index a25be84b9..000000000
--- a/website/docs/services/eks/access_entries_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: access_entries_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - access_entries_list_only
-  - eks
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>access_entries</code> in a region or regions, for all properties use <a href="/services/eks/access_entries/"><code>access_entries</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>access_entries_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An object representing an Amazon EKS AccessEntry.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.eks.access_entries_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cluster_name",
-    "type": "string",
-    "description": "The cluster that the access entry is created for."
-  },
-  {
-    "name": "principal_arn",
-    "type": "string",
-    "description": "The principal ARN that the access entry is created for."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>access_entries</code> in a region.
-```sql
-SELECT
-region,
-principal_arn,
-cluster_name
-FROM awscc.eks.access_entries_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>access_entries_list_only</code> resource, see <a href="/services/eks/access_entries/#permissions"><code>access_entries</code></a>
-
diff --git a/website/docs/services/eks/addons/index.md b/website/docs/services/eks/addons/index.md
index 5308cbd88..ff99119dd 100644
--- a/website/docs/services/eks/addons/index.md
+++ b/website/docs/services/eks/addons/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>addon</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cluster_name",
@@ -178,6 +187,28 @@ Creates, updates, deletes or gets an <code>addon</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_name",
+    "type": "string",
+    "description": "Name of Cluster"
+  },
+  {
+    "name": "addon_name",
+    "type": "string",
+    "description": "Name of Addon"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-addon.html"><code>AWS::EKS::Addon</code></a>.
 
@@ -187,31 +218,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>addons</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ClusterName, AddonName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>addons</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>addons</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>addons_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>addons</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -220,6 +257,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>addon</code>.
 ```sql
 SELECT
@@ -238,6 +284,20 @@ tags
 FROM awscc.eks.addons
 WHERE region = 'us-east-1' AND data__Identifier = '<ClusterName>|<AddonName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>addons</code> in a region.
+```sql
+SELECT
+region,
+cluster_name,
+addon_name
+FROM awscc.eks.addons_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -347,6 +407,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.eks.addons
+SET data__PatchDocument = string('{{ {
+    "AddonVersion": addon_version,
+    "PreserveOnDelete": preserve_on_delete,
+    "ResolveConflicts": resolve_conflicts,
+    "ServiceAccountRoleArn": service_account_role_arn,
+    "PodIdentityAssociations": pod_identity_associations,
+    "ConfigurationValues": configuration_values,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ClusterName>|<AddonName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/eks/addons_list_only/index.md b/website/docs/services/eks/addons_list_only/index.md
deleted file mode 100644
index c79f65439..000000000
--- a/website/docs/services/eks/addons_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: addons_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - addons_list_only
-  - eks
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>addons</code> in a region or regions, for all properties use <a href="/services/eks/addons/"><code>addons</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>addons_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema for AWS::EKS::Addon</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.eks.addons_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cluster_name",
-    "type": "string",
-    "description": "Name of Cluster"
-  },
-  {
-    "name": "addon_name",
-    "type": "string",
-    "description": "Name of Addon"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>addons</code> in a region.
-```sql
-SELECT
-region,
-cluster_name,
-addon_name
-FROM awscc.eks.addons_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>addons_list_only</code> resource, see <a href="/services/eks/addons/#permissions"><code>addons</code></a>
-
diff --git a/website/docs/services/eks/clusters/index.md b/website/docs/services/eks/clusters/index.md
index 96e4ade06..748cf21f8 100644
--- a/website/docs/services/eks/clusters/index.md
+++ b/website/docs/services/eks/clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "encryption_config",
@@ -380,6 +389,23 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The unique name to give to your cluster."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html"><code>AWS::EKS::Cluster</code></a>.
 
@@ -389,31 +415,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RoleArn, ResourcesVpcConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -422,6 +454,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cluster</code>.
 ```sql
 SELECT
@@ -454,6 +495,19 @@ zonal_shift_config
 FROM awscc.eks.clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>clusters</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.eks.clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -627,6 +681,29 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.eks.clusters
+SET data__PatchDocument = string('{{ {
+    "Logging": logging,
+    "ResourcesVpcConfig": resources_vpc_config,
+    "UpgradePolicy": upgrade_policy,
+    "RemoteNetworkConfig": remote_network_config,
+    "ComputeConfig": compute_config,
+    "StorageConfig": storage_config,
+    "Version": version,
+    "Force": force,
+    "Tags": tags,
+    "DeletionProtection": deletion_protection,
+    "ZonalShiftConfig": zonal_shift_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/eks/clusters_list_only/index.md b/website/docs/services/eks/clusters_list_only/index.md
deleted file mode 100644
index 4c5a670b6..000000000
--- a/website/docs/services/eks/clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - clusters_list_only
-  - eks
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>clusters</code> in a region or regions, for all properties use <a href="/services/eks/clusters/"><code>clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An object representing an Amazon EKS cluster.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.eks.clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The unique name to give to your cluster."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>clusters</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.eks.clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>clusters_list_only</code> resource, see <a href="/services/eks/clusters/#permissions"><code>clusters</code></a>
-
diff --git a/website/docs/services/eks/fargate_profiles/index.md b/website/docs/services/eks/fargate_profiles/index.md
index 74da8c4db..410cb2412 100644
--- a/website/docs/services/eks/fargate_profiles/index.md
+++ b/website/docs/services/eks/fargate_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>fargate_profile</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cluster_name",
@@ -111,6 +120,28 @@ Creates, updates, deletes or gets a <code>fargate_profile</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_name",
+    "type": "string",
+    "description": "Name of the Cluster"
+  },
+  {
+    "name": "fargate_profile_name",
+    "type": "string",
+    "description": "Name of FargateProfile"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-fargateprofile.html"><code>AWS::EKS::FargateProfile</code></a>.
 
@@ -120,31 +151,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>fargate_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ClusterName, PodExecutionRoleArn, Selectors, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>fargate_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>fargate_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>fargate_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>fargate_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -153,6 +190,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>fargate_profile</code>.
 ```sql
 SELECT
@@ -167,6 +213,20 @@ tags
 FROM awscc.eks.fargate_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<ClusterName>|<FargateProfileName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>fargate_profiles</code> in a region.
+```sql
+SELECT
+region,
+cluster_name,
+fargate_profile_name
+FROM awscc.eks.fargate_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -258,6 +318,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.eks.fargate_profiles
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ClusterName>|<FargateProfileName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/eks/fargate_profiles_list_only/index.md b/website/docs/services/eks/fargate_profiles_list_only/index.md
deleted file mode 100644
index 7e4dc2952..000000000
--- a/website/docs/services/eks/fargate_profiles_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: fargate_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - fargate_profiles_list_only
-  - eks
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>fargate_profiles</code> in a region or regions, for all properties use <a href="/services/eks/fargate_profiles/"><code>fargate_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>fargate_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema for AWS::EKS::FargateProfile</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.eks.fargate_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cluster_name",
-    "type": "string",
-    "description": "Name of the Cluster"
-  },
-  {
-    "name": "fargate_profile_name",
-    "type": "string",
-    "description": "Name of FargateProfile"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>fargate_profiles</code> in a region.
-```sql
-SELECT
-region,
-cluster_name,
-fargate_profile_name
-FROM awscc.eks.fargate_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>fargate_profiles_list_only</code> resource, see <a href="/services/eks/fargate_profiles/#permissions"><code>fargate_profiles</code></a>
-
diff --git a/website/docs/services/eks/identity_provider_configs/index.md b/website/docs/services/eks/identity_provider_configs/index.md
index 6913792d6..cdee62aef 100644
--- a/website/docs/services/eks/identity_provider_configs/index.md
+++ b/website/docs/services/eks/identity_provider_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>identity_provider_config</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cluster_name",
@@ -131,6 +140,33 @@ Creates, updates, deletes or gets an <code>identity_provider_config</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_name",
+    "type": "string",
+    "description": "The name of the identity provider configuration."
+  },
+  {
+    "name": "type",
+    "type": "string",
+    "description": "The type of the identity provider configuration."
+  },
+  {
+    "name": "identity_provider_config_name",
+    "type": "string",
+    "description": "The name of the OIDC provider configuration."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-identityproviderconfig.html"><code>AWS::EKS::IdentityProviderConfig</code></a>.
 
@@ -140,31 +176,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>identity_provider_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, ClusterName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>identity_provider_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>identity_provider_configs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>identity_provider_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>identity_provider_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -173,6 +215,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>identity_provider_config</code>.
 ```sql
 SELECT
@@ -186,6 +237,21 @@ identity_provider_config_arn
 FROM awscc.eks.identity_provider_configs
 WHERE region = 'us-east-1' AND data__Identifier = '<IdentityProviderConfigName>|<ClusterName>|<Type>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>identity_provider_configs</code> in a region.
+```sql
+SELECT
+region,
+identity_provider_config_name,
+cluster_name,
+type
+FROM awscc.eks.identity_provider_configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -275,6 +341,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.eks.identity_provider_configs
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IdentityProviderConfigName>|<ClusterName>|<Type>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/eks/identity_provider_configs_list_only/index.md b/website/docs/services/eks/identity_provider_configs_list_only/index.md
deleted file mode 100644
index 4dc7a7bca..000000000
--- a/website/docs/services/eks/identity_provider_configs_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: identity_provider_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - identity_provider_configs_list_only
-  - eks
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>identity_provider_configs</code> in a region or regions, for all properties use <a href="/services/eks/identity_provider_configs/"><code>identity_provider_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>identity_provider_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An object representing an Amazon EKS IdentityProviderConfig.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.eks.identity_provider_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cluster_name",
-    "type": "string",
-    "description": "The name of the identity provider configuration."
-  },
-  {
-    "name": "type",
-    "type": "string",
-    "description": "The type of the identity provider configuration."
-  },
-  {
-    "name": "identity_provider_config_name",
-    "type": "string",
-    "description": "The name of the OIDC provider configuration."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>identity_provider_configs</code> in a region.
-```sql
-SELECT
-region,
-identity_provider_config_name,
-cluster_name,
-type
-FROM awscc.eks.identity_provider_configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>identity_provider_configs_list_only</code> resource, see <a href="/services/eks/identity_provider_configs/#permissions"><code>identity_provider_configs</code></a>
-
diff --git a/website/docs/services/eks/index.md b/website/docs/services/eks/index.md
index ab78cbf33..debdd3141 100644
--- a/website/docs/services/eks/index.md
+++ b/website/docs/services/eks/index.md
@@ -20,7 +20,7 @@ The eks service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>14</b></span><br />
+<span>total resources:&nbsp;<b>7</b></span><br />
 </div>
 </div>
 
@@ -30,20 +30,13 @@ The eks service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/eks/access_entries/">access_entries</a><br />
-<a href="/services/eks/access_entries_list_only/">access_entries_list_only</a><br />
 <a href="/services/eks/addons/">addons</a><br />
-<a href="/services/eks/addons_list_only/">addons_list_only</a><br />
 <a href="/services/eks/clusters/">clusters</a><br />
-<a href="/services/eks/clusters_list_only/">clusters_list_only</a><br />
 <a href="/services/eks/fargate_profiles/">fargate_profiles</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/eks/fargate_profiles_list_only/">fargate_profiles_list_only</a><br />
 <a href="/services/eks/identity_provider_configs/">identity_provider_configs</a><br />
-<a href="/services/eks/identity_provider_configs_list_only/">identity_provider_configs_list_only</a><br />
 <a href="/services/eks/nodegroups/">nodegroups</a><br />
-<a href="/services/eks/nodegroups_list_only/">nodegroups_list_only</a><br />
-<a href="/services/eks/pod_identity_associations/">pod_identity_associations</a><br />
-<a href="/services/eks/pod_identity_associations_list_only/">pod_identity_associations_list_only</a>
+<a href="/services/eks/pod_identity_associations/">pod_identity_associations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/eks/nodegroups/index.md b/website/docs/services/eks/nodegroups/index.md
index d47f12bf2..1d9b125fe 100644
--- a/website/docs/services/eks/nodegroups/index.md
+++ b/website/docs/services/eks/nodegroups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>nodegroup</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ami_type",
@@ -232,6 +241,23 @@ Creates, updates, deletes or gets a <code>nodegroup</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html"><code>AWS::EKS::Nodegroup</code></a>.
 
@@ -241,31 +267,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>nodegroups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ClusterName, NodeRole, Subnets, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>nodegroups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>nodegroups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>nodegroups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>nodegroups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -274,6 +306,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>nodegroup</code>.
 ```sql
 SELECT
@@ -302,6 +343,19 @@ arn
 FROM awscc.eks.nodegroups
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>nodegroups</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.eks.nodegroups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -456,6 +510,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.eks.nodegroups
+SET data__PatchDocument = string('{{ {
+    "ForceUpdateEnabled": force_update_enabled,
+    "Labels": labels,
+    "LaunchTemplate": launch_template,
+    "ReleaseVersion": release_version,
+    "ScalingConfig": scaling_config,
+    "Tags": tags,
+    "Taints": taints,
+    "UpdateConfig": update_config,
+    "NodeRepairConfig": node_repair_config,
+    "Version": version
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/eks/nodegroups_list_only/index.md b/website/docs/services/eks/nodegroups_list_only/index.md
deleted file mode 100644
index f3ab020d1..000000000
--- a/website/docs/services/eks/nodegroups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: nodegroups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - nodegroups_list_only
-  - eks
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>nodegroups</code> in a region or regions, for all properties use <a href="/services/eks/nodegroups/"><code>nodegroups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>nodegroups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::EKS::Nodegroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.eks.nodegroups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>nodegroups</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.eks.nodegroups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>nodegroups_list_only</code> resource, see <a href="/services/eks/nodegroups/#permissions"><code>nodegroups</code></a>
-
diff --git a/website/docs/services/eks/pod_identity_associations/index.md b/website/docs/services/eks/pod_identity_associations/index.md
index 80cc75af6..c1351c13d 100644
--- a/website/docs/services/eks/pod_identity_associations/index.md
+++ b/website/docs/services/eks/pod_identity_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>pod_identity_association</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cluster_name",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets a <code>pod_identity_association</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "association_arn",
+    "type": "string",
+    "description": "The ARN of the pod identity association."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-podidentityassociation.html"><code>AWS::EKS::PodIdentityAssociation</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>pod_identity_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ClusterName, RoleArn, Namespace, ServiceAccount, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>pod_identity_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>pod_identity_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>pod_identity_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>pod_identity_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>pod_identity_association</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ tags
 FROM awscc.eks.pod_identity_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<AssociationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>pod_identity_associations</code> in a region.
+```sql
+SELECT
+region,
+association_arn
+FROM awscc.eks.pod_identity_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -253,6 +307,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.eks.pod_identity_associations
+SET data__PatchDocument = string('{{ {
+    "RoleArn": role_arn,
+    "TargetRoleArn": target_role_arn,
+    "DisableSessionTags": disable_session_tags,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AssociationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/eks/pod_identity_associations_list_only/index.md b/website/docs/services/eks/pod_identity_associations_list_only/index.md
deleted file mode 100644
index 71c106971..000000000
--- a/website/docs/services/eks/pod_identity_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: pod_identity_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - pod_identity_associations_list_only
-  - eks
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>pod_identity_associations</code> in a region or regions, for all properties use <a href="/services/eks/pod_identity_associations/"><code>pod_identity_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>pod_identity_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An object representing an Amazon EKS PodIdentityAssociation.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.eks.pod_identity_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "association_arn",
-    "type": "string",
-    "description": "The ARN of the pod identity association."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>pod_identity_associations</code> in a region.
-```sql
-SELECT
-region,
-association_arn
-FROM awscc.eks.pod_identity_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>pod_identity_associations_list_only</code> resource, see <a href="/services/eks/pod_identity_associations/#permissions"><code>pod_identity_associations</code></a>
-
diff --git a/website/docs/services/elasticache/global_replication_groups/index.md b/website/docs/services/elasticache/global_replication_groups/index.md
index e8bb71990..9da2b3678 100644
--- a/website/docs/services/elasticache/global_replication_groups/index.md
+++ b/website/docs/services/elasticache/global_replication_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>global_replication_group</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "global_replication_group_id_suffix",
@@ -146,6 +155,23 @@ Creates, updates, deletes or gets a <code>global_replication_group</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "global_replication_group_id",
+    "type": "string",
+    "description": "The name of the Global Datastore, it is generated by ElastiCache adding a prefix to GlobalReplicationGroupIdSuffix."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-globalreplicationgroup.html"><code>AWS::ElastiCache::GlobalReplicationGroup</code></a>.
 
@@ -155,31 +181,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>global_replication_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Members, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>global_replication_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>global_replication_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>global_replication_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>global_replication_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -188,6 +220,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>global_replication_group</code>.
 ```sql
 SELECT
@@ -207,6 +248,19 @@ regional_configurations
 FROM awscc.elasticache.global_replication_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<GlobalReplicationGroupId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>global_replication_groups</code> in a region.
+```sql
+SELECT
+region,
+global_replication_group_id
+FROM awscc.elasticache.global_replication_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -312,6 +366,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.elasticache.global_replication_groups
+SET data__PatchDocument = string('{{ {
+    "GlobalReplicationGroupIdSuffix": global_replication_group_id_suffix,
+    "AutomaticFailoverEnabled": automatic_failover_enabled,
+    "CacheNodeType": cache_node_type,
+    "EngineVersion": engine_version,
+    "Engine": engine,
+    "CacheParameterGroupName": cache_parameter_group_name,
+    "GlobalNodeGroupCount": global_node_group_count,
+    "GlobalReplicationGroupDescription": global_replication_group_description,
+    "Members": members,
+    "RegionalConfigurations": regional_configurations
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<GlobalReplicationGroupId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticache/global_replication_groups_list_only/index.md b/website/docs/services/elasticache/global_replication_groups_list_only/index.md
deleted file mode 100644
index e926df42d..000000000
--- a/website/docs/services/elasticache/global_replication_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: global_replication_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - global_replication_groups_list_only
-  - elasticache
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>global_replication_groups</code> in a region or regions, for all properties use <a href="/services/elasticache/global_replication_groups/"><code>global_replication_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>global_replication_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::ElastiCache::GlobalReplicationGroup resource creates an Amazon ElastiCache Global Replication Group.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticache.global_replication_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "global_replication_group_id",
-    "type": "string",
-    "description": "The name of the Global Datastore, it is generated by ElastiCache adding a prefix to GlobalReplicationGroupIdSuffix."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>global_replication_groups</code> in a region.
-```sql
-SELECT
-region,
-global_replication_group_id
-FROM awscc.elasticache.global_replication_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>global_replication_groups_list_only</code> resource, see <a href="/services/elasticache/global_replication_groups/#permissions"><code>global_replication_groups</code></a>
-
diff --git a/website/docs/services/elasticache/index.md b/website/docs/services/elasticache/index.md
index 080ef9c6c..5bbe6d01b 100644
--- a/website/docs/services/elasticache/index.md
+++ b/website/docs/services/elasticache/index.md
@@ -20,7 +20,7 @@ The elasticache service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>12</b></span><br />
+<span>total resources:&nbsp;<b>6</b></span><br />
 </div>
 </div>
 
@@ -30,18 +30,12 @@ The elasticache service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/elasticache/global_replication_groups/">global_replication_groups</a><br />
-<a href="/services/elasticache/global_replication_groups_list_only/">global_replication_groups_list_only</a><br />
 <a href="/services/elasticache/parameter_groups/">parameter_groups</a><br />
-<a href="/services/elasticache/parameter_groups_list_only/">parameter_groups_list_only</a><br />
-<a href="/services/elasticache/serverless_caches/">serverless_caches</a><br />
-<a href="/services/elasticache/serverless_caches_list_only/">serverless_caches_list_only</a>
+<a href="/services/elasticache/serverless_caches/">serverless_caches</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/elasticache/subnet_groups/">subnet_groups</a><br />
-<a href="/services/elasticache/subnet_groups_list_only/">subnet_groups_list_only</a><br />
 <a href="/services/elasticache/user_groups/">user_groups</a><br />
-<a href="/services/elasticache/user_groups_list_only/">user_groups_list_only</a><br />
-<a href="/services/elasticache/users/">users</a><br />
-<a href="/services/elasticache/users_list_only/">users_list_only</a>
+<a href="/services/elasticache/users/">users</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/elasticache/parameter_groups/index.md b/website/docs/services/elasticache/parameter_groups/index.md
index 2a623351f..474bd73e0 100644
--- a/website/docs/services/elasticache/parameter_groups/index.md
+++ b/website/docs/services/elasticache/parameter_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>parameter_group</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>parameter_group</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cache_parameter_group_name",
+    "type": "string",
+    "description": "The name of the Cache Parameter Group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-parametergroup.html"><code>AWS::ElastiCache::ParameterGroup</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>parameter_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Description, CacheParameterGroupFamily, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>parameter_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>parameter_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>parameter_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>parameter_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>parameter_group</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ cache_parameter_group_family
 FROM awscc.elasticache.parameter_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<CacheParameterGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>parameter_groups</code> in a region.
+```sql
+SELECT
+region,
+cache_parameter_group_name
+FROM awscc.elasticache.parameter_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -207,6 +261,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.elasticache.parameter_groups
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Properties": properties,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CacheParameterGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticache/parameter_groups_list_only/index.md b/website/docs/services/elasticache/parameter_groups_list_only/index.md
deleted file mode 100644
index 79413c999..000000000
--- a/website/docs/services/elasticache/parameter_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: parameter_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - parameter_groups_list_only
-  - elasticache
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>parameter_groups</code> in a region or regions, for all properties use <a href="/services/elasticache/parameter_groups/"><code>parameter_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>parameter_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ElastiCache::ParameterGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticache.parameter_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cache_parameter_group_name",
-    "type": "string",
-    "description": "The name of the Cache Parameter Group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>parameter_groups</code> in a region.
-```sql
-SELECT
-region,
-cache_parameter_group_name
-FROM awscc.elasticache.parameter_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>parameter_groups_list_only</code> resource, see <a href="/services/elasticache/parameter_groups/#permissions"><code>parameter_groups</code></a>
-
diff --git a/website/docs/services/elasticache/serverless_caches/index.md b/website/docs/services/elasticache/serverless_caches/index.md
index b223ed909..32ad1d8b6 100644
--- a/website/docs/services/elasticache/serverless_caches/index.md
+++ b/website/docs/services/elasticache/serverless_caches/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>serverless_cach</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "serverless_cache_name",
@@ -200,6 +209,23 @@ Creates, updates, deletes or gets a <code>serverless_cach</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "serverless_cache_name",
+    "type": "string",
+    "description": "The name of the Serverless Cache. This value must be unique."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-serverlesscach.html"><code>AWS::ElastiCache::ServerlessCache</code></a>.
 
@@ -209,31 +235,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>serverless_caches</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ServerlessCacheName, Engine, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>serverless_caches</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>serverless_caches</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>serverless_caches_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>serverless_caches</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -242,6 +274,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>serverless_cach</code>.
 ```sql
 SELECT
@@ -269,6 +310,19 @@ final_snapshot_name
 FROM awscc.elasticache.serverless_caches
 WHERE region = 'us-east-1' AND data__Identifier = '<ServerlessCacheName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>serverless_caches</code> in a region.
+```sql
+SELECT
+region,
+serverless_cache_name
+FROM awscc.elasticache.serverless_caches_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -405,6 +459,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.elasticache.serverless_caches
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Engine": engine,
+    "MajorEngineVersion": major_engine_version,
+    "CacheUsageLimits": cache_usage_limits,
+    "SecurityGroupIds": security_group_ids,
+    "Tags": tags,
+    "UserGroupId": user_group_id,
+    "SnapshotRetentionLimit": snapshot_retention_limit,
+    "DailySnapshotTime": daily_snapshot_time,
+    "FinalSnapshotName": final_snapshot_name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ServerlessCacheName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticache/serverless_caches_list_only/index.md b/website/docs/services/elasticache/serverless_caches_list_only/index.md
deleted file mode 100644
index 16457da8d..000000000
--- a/website/docs/services/elasticache/serverless_caches_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: serverless_caches_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - serverless_caches_list_only
-  - elasticache
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>serverless_caches</code> in a region or regions, for all properties use <a href="/services/elasticache/serverless_caches/"><code>serverless_caches</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>serverless_caches_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::ElastiCache::ServerlessCache resource creates an Amazon ElastiCache Serverless Cache.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticache.serverless_caches_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "serverless_cache_name",
-    "type": "string",
-    "description": "The name of the Serverless Cache. This value must be unique."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>serverless_caches</code> in a region.
-```sql
-SELECT
-region,
-serverless_cache_name
-FROM awscc.elasticache.serverless_caches_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>serverless_caches_list_only</code> resource, see <a href="/services/elasticache/serverless_caches/#permissions"><code>serverless_caches</code></a>
-
diff --git a/website/docs/services/elasticache/subnet_groups/index.md b/website/docs/services/elasticache/subnet_groups/index.md
index 2a689cee8..ca8ad6da9 100644
--- a/website/docs/services/elasticache/subnet_groups/index.md
+++ b/website/docs/services/elasticache/subnet_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>subnet_group</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>subnet_group</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cache_subnet_group_name",
+    "type": "string",
+    "description": "The name for the cache subnet group. This value is stored as a lowercase string."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-subnetgroup.html"><code>AWS::ElastiCache::SubnetGroup</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>subnet_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Description, SubnetIds, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>subnet_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>subnet_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>subnet_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>subnet_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>subnet_group</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ tags
 FROM awscc.elasticache.subnet_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<CacheSubnetGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>subnet_groups</code> in a region.
+```sql
+SELECT
+region,
+cache_subnet_group_name
+FROM awscc.elasticache.subnet_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -202,6 +256,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.elasticache.subnet_groups
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "SubnetIds": subnet_ids,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CacheSubnetGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticache/subnet_groups_list_only/index.md b/website/docs/services/elasticache/subnet_groups_list_only/index.md
deleted file mode 100644
index 3b0762ab7..000000000
--- a/website/docs/services/elasticache/subnet_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: subnet_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - subnet_groups_list_only
-  - elasticache
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>subnet_groups</code> in a region or regions, for all properties use <a href="/services/elasticache/subnet_groups/"><code>subnet_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>subnet_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ElastiCache::SubnetGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticache.subnet_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cache_subnet_group_name",
-    "type": "string",
-    "description": "The name for the cache subnet group. This value is stored as a lowercase string."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>subnet_groups</code> in a region.
-```sql
-SELECT
-region,
-cache_subnet_group_name
-FROM awscc.elasticache.subnet_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>subnet_groups_list_only</code> resource, see <a href="/services/elasticache/subnet_groups/#permissions"><code>subnet_groups</code></a>
-
diff --git a/website/docs/services/elasticache/user_groups/index.md b/website/docs/services/elasticache/user_groups/index.md
index 25795e762..605f71d8e 100644
--- a/website/docs/services/elasticache/user_groups/index.md
+++ b/website/docs/services/elasticache/user_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>user_group</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "status",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets an <code>user_group</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "user_group_id",
+    "type": "string",
+    "description": "The ID of the user group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-usergroup.html"><code>AWS::ElastiCache::UserGroup</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>user_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="UserGroupId, Engine, UserIds, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>user_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>user_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>user_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>user_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user_group</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.elasticache.user_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<UserGroupId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>user_groups</code> in a region.
+```sql
+SELECT
+region,
+user_group_id
+FROM awscc.elasticache.user_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -216,6 +270,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.elasticache.user_groups
+SET data__PatchDocument = string('{{ {
+    "Engine": engine,
+    "UserIds": user_ids,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserGroupId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticache/user_groups_list_only/index.md b/website/docs/services/elasticache/user_groups_list_only/index.md
deleted file mode 100644
index f57770bf3..000000000
--- a/website/docs/services/elasticache/user_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: user_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - user_groups_list_only
-  - elasticache
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>user_groups</code> in a region or regions, for all properties use <a href="/services/elasticache/user_groups/"><code>user_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>user_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ElastiCache::UserGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticache.user_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "user_group_id",
-    "type": "string",
-    "description": "The ID of the user group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>user_groups</code> in a region.
-```sql
-SELECT
-region,
-user_group_id
-FROM awscc.elasticache.user_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>user_groups_list_only</code> resource, see <a href="/services/elasticache/user_groups/#permissions"><code>user_groups</code></a>
-
diff --git a/website/docs/services/elasticache/users/index.md b/website/docs/services/elasticache/users/index.md
index ccf4b2c4c..71802ef60 100644
--- a/website/docs/services/elasticache/users/index.md
+++ b/website/docs/services/elasticache/users/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>user</code> resource or lists <code>us
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "status",
@@ -114,6 +123,23 @@ Creates, updates, deletes or gets a <code>user</code> resource or lists <code>us
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "user_id",
+    "type": "string",
+    "description": "The ID of the user."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-user.html"><code>AWS::ElastiCache::User</code></a>.
 
@@ -123,31 +149,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>users</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="UserId, UserName, Engine, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>users</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>users</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>users_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>users</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +188,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user</code>.
 ```sql
 SELECT
@@ -173,6 +214,19 @@ tags
 FROM awscc.elasticache.users
 WHERE region = 'us-east-1' AND data__Identifier = '<UserId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>users</code> in a region.
+```sql
+SELECT
+region,
+user_id
+FROM awscc.elasticache.users_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -271,6 +325,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.elasticache.users
+SET data__PatchDocument = string('{{ {
+    "Engine": engine,
+    "AccessString": access_string,
+    "NoPasswordRequired": no_password_required,
+    "Passwords": passwords,
+    "AuthenticationMode": authentication_mode,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticache/users_list_only/index.md b/website/docs/services/elasticache/users_list_only/index.md
deleted file mode 100644
index 792e7a21d..000000000
--- a/website/docs/services/elasticache/users_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: users_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - users_list_only
-  - elasticache
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>users</code> in a region or regions, for all properties use <a href="/services/elasticache/users/"><code>users</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>users_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ElastiCache::User</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticache.users_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "user_id",
-    "type": "string",
-    "description": "The ID of the user."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>users</code> in a region.
-```sql
-SELECT
-region,
-user_id
-FROM awscc.elasticache.users_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>users_list_only</code> resource, see <a href="/services/elasticache/users/#permissions"><code>users</code></a>
-
diff --git a/website/docs/services/elasticbeanstalk/application_versions/index.md b/website/docs/services/elasticbeanstalk/application_versions/index.md
index 58dc1ea4e..38fdcb00e 100644
--- a/website/docs/services/elasticbeanstalk/application_versions/index.md
+++ b/website/docs/services/elasticbeanstalk/application_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application_version</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -72,6 +81,28 @@ Creates, updates, deletes or gets an <code>application_version</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "application_name",
+    "type": "string",
+    "description": "The name of the Elastic Beanstalk application that is associated with this application version."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-applicationversion.html"><code>AWS::ElasticBeanstalk::ApplicationVersion</code></a>.
 
@@ -81,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>application_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApplicationName, SourceBundle, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>application_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>application_versions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>application_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>application_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application_version</code>.
 ```sql
 SELECT
@@ -125,6 +171,20 @@ source_bundle
 FROM awscc.elasticbeanstalk.application_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationName>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>application_versions</code> in a region.
+```sql
+SELECT
+region,
+application_name,
+id
+FROM awscc.elasticbeanstalk.application_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -197,6 +257,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.elasticbeanstalk.application_versions
+SET data__PatchDocument = string('{{ {
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationName>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticbeanstalk/application_versions_list_only/index.md b/website/docs/services/elasticbeanstalk/application_versions_list_only/index.md
deleted file mode 100644
index 909cd75d1..000000000
--- a/website/docs/services/elasticbeanstalk/application_versions_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: application_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - application_versions_list_only
-  - elasticbeanstalk
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>application_versions</code> in a region or regions, for all properties use <a href="/services/elasticbeanstalk/application_versions/"><code>application_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>application_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ElasticBeanstalk::ApplicationVersion</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticbeanstalk.application_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "application_name",
-    "type": "string",
-    "description": "The name of the Elastic Beanstalk application that is associated with this application version."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>application_versions</code> in a region.
-```sql
-SELECT
-region,
-application_name,
-id
-FROM awscc.elasticbeanstalk.application_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>application_versions_list_only</code> resource, see <a href="/services/elasticbeanstalk/application_versions/#permissions"><code>application_versions</code></a>
-
diff --git a/website/docs/services/elasticbeanstalk/applications/index.md b/website/docs/services/elasticbeanstalk/applications/index.md
index e4da21442..39cf7ab18 100644
--- a/website/docs/services/elasticbeanstalk/applications/index.md
+++ b/website/docs/services/elasticbeanstalk/applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "application_name",
@@ -113,6 +122,23 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_name",
+    "type": "string",
+    "description": "A name for the Elastic Beanstalk application. If you don't specify a name, AWS CloudFormation generates a unique physical ID and uses that ID for the application name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-application.html"><code>AWS::ElasticBeanstalk::Application</code></a>.
 
@@ -122,31 +148,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -155,6 +187,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application</code>.
 ```sql
 SELECT
@@ -165,6 +206,19 @@ resource_lifecycle_config
 FROM awscc.elasticbeanstalk.applications
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>applications</code> in a region.
+```sql
+SELECT
+region,
+application_name
+FROM awscc.elasticbeanstalk.applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -247,6 +301,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.elasticbeanstalk.applications
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "ResourceLifecycleConfig": resource_lifecycle_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticbeanstalk/applications_list_only/index.md b/website/docs/services/elasticbeanstalk/applications_list_only/index.md
deleted file mode 100644
index 2b92287a9..000000000
--- a/website/docs/services/elasticbeanstalk/applications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - applications_list_only
-  - elasticbeanstalk
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>applications</code> in a region or regions, for all properties use <a href="/services/elasticbeanstalk/applications/"><code>applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::ElasticBeanstalk::Application resource specifies an Elastic Beanstalk application.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticbeanstalk.applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_name",
-    "type": "string",
-    "description": "A name for the Elastic Beanstalk application. If you don't specify a name, AWS CloudFormation generates a unique physical ID and uses that ID for the application name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>applications</code> in a region.
-```sql
-SELECT
-region,
-application_name
-FROM awscc.elasticbeanstalk.applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>applications_list_only</code> resource, see <a href="/services/elasticbeanstalk/applications/#permissions"><code>applications</code></a>
-
diff --git a/website/docs/services/elasticbeanstalk/configuration_templates/index.md b/website/docs/services/elasticbeanstalk/configuration_templates/index.md
index b6004acc0..593aa7400 100644
--- a/website/docs/services/elasticbeanstalk/configuration_templates/index.md
+++ b/website/docs/services/elasticbeanstalk/configuration_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>configuration_template</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "application_name",
@@ -114,6 +123,28 @@ Creates, updates, deletes or gets a <code>configuration_template</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_name",
+    "type": "string",
+    "description": "The name of the Elastic Beanstalk application to associate with this configuration template."
+  },
+  {
+    "name": "template_name",
+    "type": "string",
+    "description": "The name of the configuration template"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html"><code>AWS::ElasticBeanstalk::ConfigurationTemplate</code></a>.
 
@@ -123,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>configuration_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApplicationName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>configuration_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>configuration_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>configuration_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>configuration_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>configuration_template</code>.
 ```sql
 SELECT
@@ -171,6 +217,20 @@ template_name
 FROM awscc.elasticbeanstalk.configuration_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationName>|<TemplateName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>configuration_templates</code> in a region.
+```sql
+SELECT
+region,
+application_name,
+template_name
+FROM awscc.elasticbeanstalk.configuration_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -261,6 +321,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.elasticbeanstalk.configuration_templates
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "OptionSettings": option_settings
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationName>|<TemplateName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticbeanstalk/configuration_templates_list_only/index.md b/website/docs/services/elasticbeanstalk/configuration_templates_list_only/index.md
deleted file mode 100644
index f1982d018..000000000
--- a/website/docs/services/elasticbeanstalk/configuration_templates_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: configuration_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - configuration_templates_list_only
-  - elasticbeanstalk
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>configuration_templates</code> in a region or regions, for all properties use <a href="/services/elasticbeanstalk/configuration_templates/"><code>configuration_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>configuration_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ElasticBeanstalk::ConfigurationTemplate</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticbeanstalk.configuration_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_name",
-    "type": "string",
-    "description": "The name of the Elastic Beanstalk application to associate with this configuration template."
-  },
-  {
-    "name": "template_name",
-    "type": "string",
-    "description": "The name of the configuration template"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>configuration_templates</code> in a region.
-```sql
-SELECT
-region,
-application_name,
-template_name
-FROM awscc.elasticbeanstalk.configuration_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>configuration_templates_list_only</code> resource, see <a href="/services/elasticbeanstalk/configuration_templates/#permissions"><code>configuration_templates</code></a>
-
diff --git a/website/docs/services/elasticbeanstalk/environments/index.md b/website/docs/services/elasticbeanstalk/environments/index.md
index a6f1021e1..66974119c 100644
--- a/website/docs/services/elasticbeanstalk/environments/index.md
+++ b/website/docs/services/elasticbeanstalk/environments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "platform_arn",
@@ -156,6 +165,23 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "environment_name",
+    "type": "string",
+    "description": "A unique name for the environment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-environment.html"><code>AWS::ElasticBeanstalk::Environment</code></a>.
 
@@ -165,31 +191,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApplicationName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>environments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -198,6 +230,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>environment</code>.
 ```sql
 SELECT
@@ -218,6 +259,19 @@ tags
 FROM awscc.elasticbeanstalk.environments
 WHERE region = 'us-east-1' AND data__Identifier = '<EnvironmentName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>environments</code> in a region.
+```sql
+SELECT
+region,
+environment_name
+FROM awscc.elasticbeanstalk.environments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -331,6 +385,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.elasticbeanstalk.environments
+SET data__PatchDocument = string('{{ {
+    "PlatformArn": platform_arn,
+    "Description": description,
+    "OperationsRole": operations_role,
+    "VersionLabel": version_label,
+    "OptionSettings": option_settings,
+    "TemplateName": template_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<EnvironmentName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticbeanstalk/environments_list_only/index.md b/website/docs/services/elasticbeanstalk/environments_list_only/index.md
deleted file mode 100644
index c3efc68de..000000000
--- a/website/docs/services/elasticbeanstalk/environments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: environments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - environments_list_only
-  - elasticbeanstalk
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>environments</code> in a region or regions, for all properties use <a href="/services/elasticbeanstalk/environments/"><code>environments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>environments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ElasticBeanstalk::Environment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticbeanstalk.environments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "environment_name",
-    "type": "string",
-    "description": "A unique name for the environment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>environments</code> in a region.
-```sql
-SELECT
-region,
-environment_name
-FROM awscc.elasticbeanstalk.environments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>environments_list_only</code> resource, see <a href="/services/elasticbeanstalk/environments/#permissions"><code>environments</code></a>
-
diff --git a/website/docs/services/elasticbeanstalk/index.md b/website/docs/services/elasticbeanstalk/index.md
index 27442821f..ca33107d7 100644
--- a/website/docs/services/elasticbeanstalk/index.md
+++ b/website/docs/services/elasticbeanstalk/index.md
@@ -20,7 +20,7 @@ The elasticbeanstalk service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The elasticbeanstalk service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/elasticbeanstalk/application_versions/">application_versions</a><br />
-<a href="/services/elasticbeanstalk/application_versions_list_only/">application_versions_list_only</a><br />
-<a href="/services/elasticbeanstalk/applications/">applications</a><br />
-<a href="/services/elasticbeanstalk/applications_list_only/">applications_list_only</a>
+<a href="/services/elasticbeanstalk/applications/">applications</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/elasticbeanstalk/configuration_templates/">configuration_templates</a><br />
-<a href="/services/elasticbeanstalk/configuration_templates_list_only/">configuration_templates_list_only</a><br />
-<a href="/services/elasticbeanstalk/environments/">environments</a><br />
-<a href="/services/elasticbeanstalk/environments_list_only/">environments_list_only</a>
+<a href="/services/elasticbeanstalk/environments/">environments</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/elasticloadbalancingv2/index.md b/website/docs/services/elasticloadbalancingv2/index.md
index e545a0120..0f754218b 100644
--- a/website/docs/services/elasticloadbalancingv2/index.md
+++ b/website/docs/services/elasticloadbalancingv2/index.md
@@ -20,7 +20,7 @@ The elasticloadbalancingv2 service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>12</b></span><br />
+<span>total resources:&nbsp;<b>6</b></span><br />
 </div>
 </div>
 
@@ -30,18 +30,12 @@ The elasticloadbalancingv2 service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/elasticloadbalancingv2/listener_rules/">listener_rules</a><br />
-<a href="/services/elasticloadbalancingv2/listener_rules_list_only/">listener_rules_list_only</a><br />
 <a href="/services/elasticloadbalancingv2/listeners/">listeners</a><br />
-<a href="/services/elasticloadbalancingv2/listeners_list_only/">listeners_list_only</a><br />
-<a href="/services/elasticloadbalancingv2/load_balancers/">load_balancers</a><br />
-<a href="/services/elasticloadbalancingv2/load_balancers_list_only/">load_balancers_list_only</a>
+<a href="/services/elasticloadbalancingv2/load_balancers/">load_balancers</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/elasticloadbalancingv2/target_groups/">target_groups</a><br />
-<a href="/services/elasticloadbalancingv2/target_groups_list_only/">target_groups_list_only</a><br />
 <a href="/services/elasticloadbalancingv2/trust_store_revocations/">trust_store_revocations</a><br />
-<a href="/services/elasticloadbalancingv2/trust_store_revocations_list_only/">trust_store_revocations_list_only</a><br />
-<a href="/services/elasticloadbalancingv2/trust_stores/">trust_stores</a><br />
-<a href="/services/elasticloadbalancingv2/trust_stores_list_only/">trust_stores_list_only</a>
+<a href="/services/elasticloadbalancingv2/trust_stores/">trust_stores</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/elasticloadbalancingv2/listener_rules/index.md b/website/docs/services/elasticloadbalancingv2/listener_rules/index.md
index c80ce4c96..7446314a4 100644
--- a/website/docs/services/elasticloadbalancingv2/listener_rules/index.md
+++ b/website/docs/services/elasticloadbalancingv2/listener_rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>listener_rule</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "listener_arn",
@@ -381,6 +390,23 @@ Creates, updates, deletes or gets a <code>listener_rule</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "rule_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenerrule.html"><code>AWS::ElasticLoadBalancingV2::ListenerRule</code></a>.
 
@@ -390,31 +416,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>listener_rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Actions, Priority, Conditions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>listener_rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>listener_rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>listener_rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>listener_rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -423,6 +455,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>listener_rule</code>.
 ```sql
 SELECT
@@ -436,6 +477,19 @@ conditions
 FROM awscc.elasticloadbalancingv2.listener_rules
 WHERE region = 'us-east-1' AND data__Identifier = '<RuleArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>listener_rules</code> in a region.
+```sql
+SELECT
+region,
+rule_arn
+FROM awscc.elasticloadbalancingv2.listener_rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -574,6 +628,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.elasticloadbalancingv2.listener_rules
+SET data__PatchDocument = string('{{ {
+    "Actions": actions,
+    "Priority": priority,
+    "Conditions": conditions
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RuleArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticloadbalancingv2/listener_rules_list_only/index.md b/website/docs/services/elasticloadbalancingv2/listener_rules_list_only/index.md
deleted file mode 100644
index 3b7c086de..000000000
--- a/website/docs/services/elasticloadbalancingv2/listener_rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: listener_rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - listener_rules_list_only
-  - elasticloadbalancingv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>listener_rules</code> in a region or regions, for all properties use <a href="/services/elasticloadbalancingv2/listener_rules/"><code>listener_rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>listener_rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a listener rule. The listener must be associated with an Application Load Balancer. Each rule consists of a priority, one or more actions, and one or more conditions.<br />For more information, see &#91;Quotas for your Application Load Balancers&#93;(https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-limits.html) in the &#42;User Guide for Application Load Balancers&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticloadbalancingv2.listener_rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "rule_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>listener_rules</code> in a region.
-```sql
-SELECT
-region,
-rule_arn
-FROM awscc.elasticloadbalancingv2.listener_rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>listener_rules_list_only</code> resource, see <a href="/services/elasticloadbalancingv2/listener_rules/#permissions"><code>listener_rules</code></a>
-
diff --git a/website/docs/services/elasticloadbalancingv2/listeners/index.md b/website/docs/services/elasticloadbalancingv2/listeners/index.md
index 1d6f4b883..3522765d7 100644
--- a/website/docs/services/elasticloadbalancingv2/listeners/index.md
+++ b/website/docs/services/elasticloadbalancingv2/listeners/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>listener</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "listener_arn",
@@ -362,6 +371,23 @@ Creates, updates, deletes or gets a <code>listener</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "listener_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html"><code>AWS::ElasticLoadBalancingV2::Listener</code></a>.
 
@@ -371,31 +397,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>listeners</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LoadBalancerArn, DefaultActions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>listeners</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>listeners</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>listeners_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>listeners</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -404,6 +436,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>listener</code>.
 ```sql
 SELECT
@@ -421,6 +462,19 @@ protocol
 FROM awscc.elasticloadbalancingv2.listeners
 WHERE region = 'us-east-1' AND data__Identifier = '<ListenerArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>listeners</code> in a region.
+```sql
+SELECT
+region,
+listener_arn
+FROM awscc.elasticloadbalancingv2.listeners_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -566,6 +620,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.elasticloadbalancingv2.listeners
+SET data__PatchDocument = string('{{ {
+    "MutualAuthentication": mutual_authentication,
+    "ListenerAttributes": listener_attributes,
+    "AlpnPolicy": alpn_policy,
+    "SslPolicy": ssl_policy,
+    "DefaultActions": default_actions,
+    "Port": port,
+    "Certificates": certificates,
+    "Protocol": protocol
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ListenerArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticloadbalancingv2/listeners_list_only/index.md b/website/docs/services/elasticloadbalancingv2/listeners_list_only/index.md
deleted file mode 100644
index de2d681da..000000000
--- a/website/docs/services/elasticloadbalancingv2/listeners_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: listeners_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - listeners_list_only
-  - elasticloadbalancingv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>listeners</code> in a region or regions, for all properties use <a href="/services/elasticloadbalancingv2/listeners/"><code>listeners</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>listeners_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a listener for an Application Load Balancer, Network Load Balancer, or Gateway Load Balancer.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticloadbalancingv2.listeners_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "listener_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>listeners</code> in a region.
-```sql
-SELECT
-region,
-listener_arn
-FROM awscc.elasticloadbalancingv2.listeners_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>listeners_list_only</code> resource, see <a href="/services/elasticloadbalancingv2/listeners/#permissions"><code>listeners</code></a>
-
diff --git a/website/docs/services/elasticloadbalancingv2/load_balancers/index.md b/website/docs/services/elasticloadbalancingv2/load_balancers/index.md
index 03514108c..db976d7f5 100644
--- a/website/docs/services/elasticloadbalancingv2/load_balancers/index.md
+++ b/website/docs/services/elasticloadbalancingv2/load_balancers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>load_balancer</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ip_address_type",
@@ -188,6 +197,23 @@ Creates, updates, deletes or gets a <code>load_balancer</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "load_balancer_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html"><code>AWS::ElasticLoadBalancingV2::LoadBalancer</code></a>.
 
@@ -197,31 +223,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>load_balancers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>load_balancers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>load_balancers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>load_balancers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>load_balancers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -230,6 +262,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>load_balancer</code>.
 ```sql
 SELECT
@@ -255,6 +296,19 @@ ipv4_ipam_pool_id
 FROM awscc.elasticloadbalancingv2.load_balancers
 WHERE region = 'us-east-1' AND data__Identifier = '<LoadBalancerArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>load_balancers</code> in a region.
+```sql
+SELECT
+region,
+load_balancer_arn
+FROM awscc.elasticloadbalancingv2.load_balancers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -399,6 +453,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.elasticloadbalancingv2.load_balancers
+SET data__PatchDocument = string('{{ {
+    "IpAddressType": ip_address_type,
+    "EnablePrefixForIpv6SourceNat": enable_prefix_for_ipv6_source_nat,
+    "SecurityGroups": security_groups,
+    "LoadBalancerAttributes": load_balancer_attributes,
+    "MinimumLoadBalancerCapacity": minimum_load_balancer_capacity,
+    "Subnets": subnets,
+    "Tags": tags,
+    "SubnetMappings": subnet_mappings,
+    "EnforceSecurityGroupInboundRulesOnPrivateLinkTraffic": enforce_security_group_inbound_rules_on_private_link_traffic,
+    "Ipv4IpamPoolId": ipv4_ipam_pool_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LoadBalancerArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticloadbalancingv2/load_balancers_list_only/index.md b/website/docs/services/elasticloadbalancingv2/load_balancers_list_only/index.md
deleted file mode 100644
index 3c4c31e33..000000000
--- a/website/docs/services/elasticloadbalancingv2/load_balancers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: load_balancers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - load_balancers_list_only
-  - elasticloadbalancingv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>load_balancers</code> in a region or regions, for all properties use <a href="/services/elasticloadbalancingv2/load_balancers/"><code>load_balancers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>load_balancers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies an Application Load Balancer, a Network Load Balancer, or a Gateway Load Balancer.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticloadbalancingv2.load_balancers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "load_balancer_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>load_balancers</code> in a region.
-```sql
-SELECT
-region,
-load_balancer_arn
-FROM awscc.elasticloadbalancingv2.load_balancers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>load_balancers_list_only</code> resource, see <a href="/services/elasticloadbalancingv2/load_balancers/#permissions"><code>load_balancers</code></a>
-
diff --git a/website/docs/services/elasticloadbalancingv2/target_groups/index.md b/website/docs/services/elasticloadbalancingv2/target_groups/index.md
index 920db3d26..29452d8f9 100644
--- a/website/docs/services/elasticloadbalancingv2/target_groups/index.md
+++ b/website/docs/services/elasticloadbalancingv2/target_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>target_group</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ip_address_type",
@@ -208,6 +217,23 @@ Creates, updates, deletes or gets a <code>target_group</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "target_group_arn",
+    "type": "string",
+    "description": "The ARN of the Target Group"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html"><code>AWS::ElasticLoadBalancingV2::TargetGroup</code></a>.
 
@@ -217,31 +243,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>target_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>target_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>target_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>target_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>target_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -250,6 +282,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>target_group</code>.
 ```sql
 SELECT
@@ -280,6 +321,19 @@ tags
 FROM awscc.elasticloadbalancingv2.target_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<TargetGroupArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>target_groups</code> in a region.
+```sql
+SELECT
+region,
+target_group_arn
+FROM awscc.elasticloadbalancingv2.target_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -457,6 +511,30 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.elasticloadbalancingv2.target_groups
+SET data__PatchDocument = string('{{ {
+    "HealthCheckIntervalSeconds": health_check_interval_seconds,
+    "Matcher": matcher,
+    "HealthCheckPath": health_check_path,
+    "Targets": targets,
+    "HealthCheckEnabled": health_check_enabled,
+    "UnhealthyThresholdCount": unhealthy_threshold_count,
+    "HealthCheckTimeoutSeconds": health_check_timeout_seconds,
+    "HealthyThresholdCount": healthy_threshold_count,
+    "HealthCheckProtocol": health_check_protocol,
+    "TargetGroupAttributes": target_group_attributes,
+    "HealthCheckPort": health_check_port,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TargetGroupArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticloadbalancingv2/target_groups_list_only/index.md b/website/docs/services/elasticloadbalancingv2/target_groups_list_only/index.md
deleted file mode 100644
index c5b83c12b..000000000
--- a/website/docs/services/elasticloadbalancingv2/target_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: target_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - target_groups_list_only
-  - elasticloadbalancingv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>target_groups</code> in a region or regions, for all properties use <a href="/services/elasticloadbalancingv2/target_groups/"><code>target_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>target_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ElasticLoadBalancingV2::TargetGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticloadbalancingv2.target_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "target_group_arn",
-    "type": "string",
-    "description": "The ARN of the Target Group"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>target_groups</code> in a region.
-```sql
-SELECT
-region,
-target_group_arn
-FROM awscc.elasticloadbalancingv2.target_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>target_groups_list_only</code> resource, see <a href="/services/elasticloadbalancingv2/target_groups/#permissions"><code>target_groups</code></a>
-
diff --git a/website/docs/services/elasticloadbalancingv2/trust_store_revocations/index.md b/website/docs/services/elasticloadbalancingv2/trust_store_revocations/index.md
index 0d5f0a79a..f3e1f2c7b 100644
--- a/website/docs/services/elasticloadbalancingv2/trust_store_revocations/index.md
+++ b/website/docs/services/elasticloadbalancingv2/trust_store_revocations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>trust_store_revocation</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "revocation_contents",
@@ -104,6 +113,28 @@ Creates, updates, deletes or gets a <code>trust_store_revocation</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "trust_store_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the trust store."
+  },
+  {
+    "name": "revocation_id",
+    "type": "integer",
+    "description": "The ID associated with the revocation."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-truststorerevocation.html"><code>AWS::ElasticLoadBalancingV2::TrustStoreRevocation</code></a>.
 
@@ -113,26 +144,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>trust_store_revocations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>trust_store_revocations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>trust_store_revocations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>trust_store_revocations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +177,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>trust_store_revocation</code>.
 ```sql
 SELECT
@@ -152,6 +197,20 @@ trust_store_revocations
 FROM awscc.elasticloadbalancingv2.trust_store_revocations
 WHERE region = 'us-east-1' AND data__Identifier = '<RevocationId>|<TrustStoreArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>trust_store_revocations</code> in a region.
+```sql
+SELECT
+region,
+revocation_id,
+trust_store_arn
+FROM awscc.elasticloadbalancingv2.trust_store_revocations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -222,6 +281,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticloadbalancingv2/trust_store_revocations_list_only/index.md b/website/docs/services/elasticloadbalancingv2/trust_store_revocations_list_only/index.md
deleted file mode 100644
index 1a7b24e5c..000000000
--- a/website/docs/services/elasticloadbalancingv2/trust_store_revocations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: trust_store_revocations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - trust_store_revocations_list_only
-  - elasticloadbalancingv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>trust_store_revocations</code> in a region or regions, for all properties use <a href="/services/elasticloadbalancingv2/trust_store_revocations/"><code>trust_store_revocations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>trust_store_revocations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ElasticLoadBalancingV2::TrustStoreRevocation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticloadbalancingv2.trust_store_revocations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "trust_store_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the trust store."
-  },
-  {
-    "name": "revocation_id",
-    "type": "integer",
-    "description": "The ID associated with the revocation."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>trust_store_revocations</code> in a region.
-```sql
-SELECT
-region,
-revocation_id,
-trust_store_arn
-FROM awscc.elasticloadbalancingv2.trust_store_revocations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>trust_store_revocations_list_only</code> resource, see <a href="/services/elasticloadbalancingv2/trust_store_revocations/#permissions"><code>trust_store_revocations</code></a>
-
diff --git a/website/docs/services/elasticloadbalancingv2/trust_stores/index.md b/website/docs/services/elasticloadbalancingv2/trust_stores/index.md
index c6dd37e83..088f86ea8 100644
--- a/website/docs/services/elasticloadbalancingv2/trust_stores/index.md
+++ b/website/docs/services/elasticloadbalancingv2/trust_stores/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>trust_store</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>trust_store</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "trust_store_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the trust store."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-truststore.html"><code>AWS::ElasticLoadBalancingV2::TrustStore</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>trust_stores</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>trust_stores</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>trust_stores</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>trust_stores_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>trust_stores</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>trust_store</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ trust_store_arn
 FROM awscc.elasticloadbalancingv2.trust_stores
 WHERE region = 'us-east-1' AND data__Identifier = '<TrustStoreArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>trust_stores</code> in a region.
+```sql
+SELECT
+region,
+trust_store_arn
+FROM awscc.elasticloadbalancingv2.trust_stores_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -235,6 +289,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.elasticloadbalancingv2.trust_stores
+SET data__PatchDocument = string('{{ {
+    "CaCertificatesBundleS3Bucket": ca_certificates_bundle_s3_bucket,
+    "CaCertificatesBundleS3Key": ca_certificates_bundle_s3_key,
+    "CaCertificatesBundleS3ObjectVersion": ca_certificates_bundle_s3_object_version,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TrustStoreArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/elasticloadbalancingv2/trust_stores_list_only/index.md b/website/docs/services/elasticloadbalancingv2/trust_stores_list_only/index.md
deleted file mode 100644
index cab14d011..000000000
--- a/website/docs/services/elasticloadbalancingv2/trust_stores_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: trust_stores_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - trust_stores_list_only
-  - elasticloadbalancingv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>trust_stores</code> in a region or regions, for all properties use <a href="/services/elasticloadbalancingv2/trust_stores/"><code>trust_stores</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>trust_stores_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ElasticLoadBalancingV2::TrustStore</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.elasticloadbalancingv2.trust_stores_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "trust_store_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the trust store."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>trust_stores</code> in a region.
-```sql
-SELECT
-region,
-trust_store_arn
-FROM awscc.elasticloadbalancingv2.trust_stores_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>trust_stores_list_only</code> resource, see <a href="/services/elasticloadbalancingv2/trust_stores/#permissions"><code>trust_stores</code></a>
-
diff --git a/website/docs/services/emr/index.md b/website/docs/services/emr/index.md
index 155bb64b1..f7f285e40 100644
--- a/website/docs/services/emr/index.md
+++ b/website/docs/services/emr/index.md
@@ -20,7 +20,7 @@ The emr service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>9</b></span><br />
+<span>total resources:&nbsp;<b>5</b></span><br />
 </div>
 </div>
 
@@ -30,15 +30,11 @@ The emr service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/emr/security_configurations/">security_configurations</a><br />
-<a href="/services/emr/security_configurations_list_only/">security_configurations_list_only</a><br />
 <a href="/services/emr/steps/">steps</a><br />
-<a href="/services/emr/studio_session_mappings/">studio_session_mappings</a><br />
-<a href="/services/emr/studio_session_mappings_list_only/">studio_session_mappings_list_only</a>
+<a href="/services/emr/studio_session_mappings/">studio_session_mappings</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/emr/studios/">studios</a><br />
-<a href="/services/emr/studios_list_only/">studios_list_only</a><br />
-<a href="/services/emr/wal_workspaces/">wal_workspaces</a><br />
-<a href="/services/emr/wal_workspaces_list_only/">wal_workspaces_list_only</a>
+<a href="/services/emr/wal_workspaces/">wal_workspaces</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/emr/security_configurations/index.md b/website/docs/services/emr/security_configurations/index.md
index 0eef78a0a..75c46fd71 100644
--- a/website/docs/services/emr/security_configurations/index.md
+++ b/website/docs/services/emr/security_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>security_configuration</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>security_configuration</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the security configuration."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-securityconfiguration.html"><code>AWS::EMR::SecurityConfiguration</code></a>.
 
@@ -59,26 +85,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>security_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SecurityConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>security_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>security_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>security_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +118,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>security_configuration</code>.
 ```sql
 SELECT
@@ -96,6 +136,19 @@ security_configuration
 FROM awscc.emr.security_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>security_configurations</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.emr.security_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -160,6 +213,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/emr/security_configurations_list_only/index.md b/website/docs/services/emr/security_configurations_list_only/index.md
deleted file mode 100644
index 48c9d1c3c..000000000
--- a/website/docs/services/emr/security_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: security_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - security_configurations_list_only
-  - emr
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>security_configurations</code> in a region or regions, for all properties use <a href="/services/emr/security_configurations/"><code>security_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>security_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Use a SecurityConfiguration resource to configure data encryption, Kerberos authentication, and Amazon S3 authorization for EMRFS.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.emr.security_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the security configuration."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>security_configurations</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.emr.security_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>security_configurations_list_only</code> resource, see <a href="/services/emr/security_configurations/#permissions"><code>security_configurations</code></a>
-
diff --git a/website/docs/services/emr/steps/index.md b/website/docs/services/emr/steps/index.md
index 0b0b15546..eb58651c4 100644
--- a/website/docs/services/emr/steps/index.md
+++ b/website/docs/services/emr/steps/index.md
@@ -223,6 +223,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## Permissions
 
 To operate on the <code>steps</code> resource, the following permissions are required:
diff --git a/website/docs/services/emr/studio_session_mappings/index.md b/website/docs/services/emr/studio_session_mappings/index.md
index 812770983..3521e1dcb 100644
--- a/website/docs/services/emr/studio_session_mappings/index.md
+++ b/website/docs/services/emr/studio_session_mappings/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>studio_session_mapping</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "identity_name",
@@ -60,6 +69,33 @@ Creates, updates, deletes or gets a <code>studio_session_mapping</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "identity_name",
+    "type": "string",
+    "description": "The name of the user or group. For more information, see UserName and DisplayName in the AWS SSO Identity Store API Reference. Either IdentityName or IdentityId must be specified."
+  },
+  {
+    "name": "identity_type",
+    "type": "string",
+    "description": "Specifies whether the identity to map to the Studio is a user or a group."
+  },
+  {
+    "name": "studio_id",
+    "type": "string",
+    "description": "The ID of the Amazon EMR Studio to which the user or group will be mapped."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studiosessionmapping.html"><code>AWS::EMR::StudioSessionMapping</code></a>.
 
@@ -69,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>studio_session_mappings</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="StudioId, IdentityName, IdentityType, SessionPolicyArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>studio_session_mappings</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>studio_session_mappings</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>studio_session_mappings_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>studio_session_mappings</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>studio_session_mapping</code>.
 ```sql
 SELECT
@@ -113,6 +164,21 @@ studio_id
 FROM awscc.emr.studio_session_mappings
 WHERE region = 'us-east-1' AND data__Identifier = '<StudioId>|<IdentityType>|<IdentityName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>studio_session_mappings</code> in a region.
+```sql
+SELECT
+region,
+studio_id,
+identity_type,
+identity_name
+FROM awscc.emr.studio_session_mappings_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -191,6 +257,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.emr.studio_session_mappings
+SET data__PatchDocument = string('{{ {
+    "SessionPolicyArn": session_policy_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<StudioId>|<IdentityType>|<IdentityName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/emr/studio_session_mappings_list_only/index.md b/website/docs/services/emr/studio_session_mappings_list_only/index.md
deleted file mode 100644
index e13384e0d..000000000
--- a/website/docs/services/emr/studio_session_mappings_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: studio_session_mappings_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - studio_session_mappings_list_only
-  - emr
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>studio_session_mappings</code> in a region or regions, for all properties use <a href="/services/emr/studio_session_mappings/"><code>studio_session_mappings</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>studio_session_mappings_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An example resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.emr.studio_session_mappings_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "identity_name",
-    "type": "string",
-    "description": "The name of the user or group. For more information, see UserName and DisplayName in the AWS SSO Identity Store API Reference. Either IdentityName or IdentityId must be specified."
-  },
-  {
-    "name": "identity_type",
-    "type": "string",
-    "description": "Specifies whether the identity to map to the Studio is a user or a group."
-  },
-  {
-    "name": "studio_id",
-    "type": "string",
-    "description": "The ID of the Amazon EMR Studio to which the user or group will be mapped."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>studio_session_mappings</code> in a region.
-```sql
-SELECT
-region,
-studio_id,
-identity_type,
-identity_name
-FROM awscc.emr.studio_session_mappings_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>studio_session_mappings_list_only</code> resource, see <a href="/services/emr/studio_session_mappings/#permissions"><code>studio_session_mappings</code></a>
-
diff --git a/website/docs/services/emr/studios/index.md b/website/docs/services/emr/studios/index.md
index 5cbdf2472..1b05bc467 100644
--- a/website/docs/services/emr/studios/index.md
+++ b/website/docs/services/emr/studios/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>studio</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -137,6 +146,23 @@ Creates, updates, deletes or gets a <code>studio</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "studio_id",
+    "type": "string",
+    "description": "The ID of the EMR Studio."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html"><code>AWS::EMR::Studio</code></a>.
 
@@ -146,31 +172,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>studios</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AuthMode, EngineSecurityGroupId, Name, ServiceRole, SubnetIds, VpcId, WorkspaceSecurityGroupId, DefaultS3Location, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>studios</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>studios</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>studios_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>studios</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -179,6 +211,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>studio</code>.
 ```sql
 SELECT
@@ -206,6 +247,19 @@ encryption_key_arn
 FROM awscc.emr.studios
 WHERE region = 'us-east-1' AND data__Identifier = '<StudioId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>studios</code> in a region.
+```sql
+SELECT
+region,
+studio_id
+FROM awscc.emr.studios_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -347,6 +401,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.emr.studios
+SET data__PatchDocument = string('{{ {
+    "DefaultS3Location": default_s3_location,
+    "Description": description,
+    "Name": name,
+    "SubnetIds": subnet_ids,
+    "Tags": tags,
+    "IdpAuthUrl": idp_auth_url,
+    "IdpRelayStateParameterName": idp_relay_state_parameter_name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<StudioId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/emr/studios_list_only/index.md b/website/docs/services/emr/studios_list_only/index.md
deleted file mode 100644
index 60723a56a..000000000
--- a/website/docs/services/emr/studios_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: studios_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - studios_list_only
-  - emr
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>studios</code> in a region or regions, for all properties use <a href="/services/emr/studios/"><code>studios</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>studios_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::EMR::Studio</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.emr.studios_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "studio_id",
-    "type": "string",
-    "description": "The ID of the EMR Studio."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>studios</code> in a region.
-```sql
-SELECT
-region,
-studio_id
-FROM awscc.emr.studios_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>studios_list_only</code> resource, see <a href="/services/emr/studios/#permissions"><code>studios</code></a>
-
diff --git a/website/docs/services/emr/wal_workspaces/index.md b/website/docs/services/emr/wal_workspaces/index.md
index 0ee18533e..56feb29f3 100644
--- a/website/docs/services/emr/wal_workspaces/index.md
+++ b/website/docs/services/emr/wal_workspaces/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>wal_workspace</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "wal_workspace_name",
@@ -62,6 +71,23 @@ Creates, updates, deletes or gets a <code>wal_workspace</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "wal_workspace_name",
+    "type": "string",
+    "description": "The name of the emrwal container"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-walworkspace.html"><code>AWS::EMR::WALWorkspace</code></a>.
 
@@ -71,31 +97,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>wal_workspaces</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>wal_workspaces</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>wal_workspaces</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>wal_workspaces_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>wal_workspaces</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -104,6 +136,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>wal_workspace</code>.
 ```sql
 SELECT
@@ -113,6 +154,19 @@ tags
 FROM awscc.emr.wal_workspaces
 WHERE region = 'us-east-1' AND data__Identifier = '<WALWorkspaceName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>wal_workspaces</code> in a region.
+```sql
+SELECT
+region,
+wal_workspace_name
+FROM awscc.emr.wal_workspaces_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -181,6 +235,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.emr.wal_workspaces
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<WALWorkspaceName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/emr/wal_workspaces_list_only/index.md b/website/docs/services/emr/wal_workspaces_list_only/index.md
deleted file mode 100644
index ba9c09cd3..000000000
--- a/website/docs/services/emr/wal_workspaces_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: wal_workspaces_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - wal_workspaces_list_only
-  - emr
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>wal_workspaces</code> in a region or regions, for all properties use <a href="/services/emr/wal_workspaces/"><code>wal_workspaces</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>wal_workspaces_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::EMR::WALWorkspace Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.emr.wal_workspaces_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "wal_workspace_name",
-    "type": "string",
-    "description": "The name of the emrwal container"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>wal_workspaces</code> in a region.
-```sql
-SELECT
-region,
-wal_workspace_name
-FROM awscc.emr.wal_workspaces_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>wal_workspaces_list_only</code> resource, see <a href="/services/emr/wal_workspaces/#permissions"><code>wal_workspaces</code></a>
-
diff --git a/website/docs/services/emrcontainers/index.md b/website/docs/services/emrcontainers/index.md
index 746082beb..e647adc57 100644
--- a/website/docs/services/emrcontainers/index.md
+++ b/website/docs/services/emrcontainers/index.md
@@ -20,7 +20,7 @@ The emrcontainers service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The emrcontainers service documentation.
 <a href="/services/emrcontainers/virtual_clusters/">virtual_clusters</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/emrcontainers/virtual_clusters_list_only/">virtual_clusters_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/emrcontainers/virtual_clusters/index.md b/website/docs/services/emrcontainers/virtual_clusters/index.md
index 2e6b947b2..887cd798a 100644
--- a/website/docs/services/emrcontainers/virtual_clusters/index.md
+++ b/website/docs/services/emrcontainers/virtual_clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>virtual_cluster</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -113,6 +122,23 @@ Creates, updates, deletes or gets a <code>virtual_cluster</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Id of the virtual cluster."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emrcontainers-virtualcluster.html"><code>AWS::EMRContainers::VirtualCluster</code></a>.
 
@@ -122,31 +148,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>virtual_clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, ContainerProvider, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>virtual_clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>virtual_clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>virtual_clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>virtual_clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -155,6 +187,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>virtual_cluster</code>.
 ```sql
 SELECT
@@ -168,6 +209,19 @@ security_configuration_id
 FROM awscc.emrcontainers.virtual_clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>virtual_clusters</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.emrcontainers.virtual_clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -249,6 +303,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.emrcontainers.virtual_clusters
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "SecurityConfigurationId": security_configuration_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/emrcontainers/virtual_clusters_list_only/index.md b/website/docs/services/emrcontainers/virtual_clusters_list_only/index.md
deleted file mode 100644
index f94d998ac..000000000
--- a/website/docs/services/emrcontainers/virtual_clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: virtual_clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - virtual_clusters_list_only
-  - emrcontainers
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>virtual_clusters</code> in a region or regions, for all properties use <a href="/services/emrcontainers/virtual_clusters/"><code>virtual_clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>virtual_clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema of AWS::EMRContainers::VirtualCluster Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.emrcontainers.virtual_clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Id of the virtual cluster."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>virtual_clusters</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.emrcontainers.virtual_clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>virtual_clusters_list_only</code> resource, see <a href="/services/emrcontainers/virtual_clusters/#permissions"><code>virtual_clusters</code></a>
-
diff --git a/website/docs/services/emrserverless/applications/index.md b/website/docs/services/emrserverless/applications/index.md
index cdf8bf66e..ffb84ffb9 100644
--- a/website/docs/services/emrserverless/applications/index.md
+++ b/website/docs/services/emrserverless/applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "architecture",
@@ -388,6 +397,23 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_id",
+    "type": "string",
+    "description": "The ID of the EMR Serverless Application."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emrserverless-application.html"><code>AWS::EMRServerless::Application</code></a>.
 
@@ -397,31 +423,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ReleaseLabel, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -430,6 +462,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application</code>.
 ```sql
 SELECT
@@ -456,6 +497,19 @@ identity_center_configuration
 FROM awscc.emrserverless.applications
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>applications</code> in a region.
+```sql
+SELECT
+region,
+application_id
+FROM awscc.emrserverless.applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -616,6 +670,33 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.emrserverless.applications
+SET data__PatchDocument = string('{{ {
+    "Architecture": architecture,
+    "ReleaseLabel": release_label,
+    "InitialCapacity": initial_capacity,
+    "MaximumCapacity": maximum_capacity,
+    "Tags": tags,
+    "AutoStartConfiguration": auto_start_configuration,
+    "AutoStopConfiguration": auto_stop_configuration,
+    "ImageConfiguration": image_configuration,
+    "MonitoringConfiguration": monitoring_configuration,
+    "RuntimeConfiguration": runtime_configuration,
+    "InteractiveConfiguration": interactive_configuration,
+    "NetworkConfiguration": network_configuration,
+    "WorkerTypeSpecifications": worker_type_specifications,
+    "SchedulerConfiguration": scheduler_configuration,
+    "IdentityCenterConfiguration": identity_center_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/emrserverless/applications_list_only/index.md b/website/docs/services/emrserverless/applications_list_only/index.md
deleted file mode 100644
index 0022a5b98..000000000
--- a/website/docs/services/emrserverless/applications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - applications_list_only
-  - emrserverless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>applications</code> in a region or regions, for all properties use <a href="/services/emrserverless/applications/"><code>applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::EMRServerless::Application Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.emrserverless.applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_id",
-    "type": "string",
-    "description": "The ID of the EMR Serverless Application."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>applications</code> in a region.
-```sql
-SELECT
-region,
-application_id
-FROM awscc.emrserverless.applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>applications_list_only</code> resource, see <a href="/services/emrserverless/applications/#permissions"><code>applications</code></a>
-
diff --git a/website/docs/services/emrserverless/index.md b/website/docs/services/emrserverless/index.md
index f51f7b08c..4f80c8ba6 100644
--- a/website/docs/services/emrserverless/index.md
+++ b/website/docs/services/emrserverless/index.md
@@ -20,7 +20,7 @@ The emrserverless service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The emrserverless service documentation.
 <a href="/services/emrserverless/applications/">applications</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/emrserverless/applications_list_only/">applications_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/entityresolution/id_mapping_workflows/index.md b/website/docs/services/entityresolution/id_mapping_workflows/index.md
index 594478c43..939d58bfa 100644
--- a/website/docs/services/entityresolution/id_mapping_workflows/index.md
+++ b/website/docs/services/entityresolution/id_mapping_workflows/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>id_mapping_workflow</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -218,6 +227,23 @@ Creates, updates, deletes or gets an <code>id_mapping_workflow</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "workflow_name",
+    "type": "string",
+    "description": "The name of the IdMappingWorkflow"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-entityresolution-idmappingworkflow.html"><code>AWS::EntityResolution::IdMappingWorkflow</code></a>.
 
@@ -227,31 +253,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>id_mapping_workflows</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="WorkflowName, InputSourceConfig, IdMappingTechniques, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>id_mapping_workflows</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>id_mapping_workflows</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>id_mapping_workflows_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>id_mapping_workflows</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -260,6 +292,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>id_mapping_workflow</code>.
 ```sql
 SELECT
@@ -278,6 +319,19 @@ tags
 FROM awscc.entityresolution.id_mapping_workflows
 WHERE region = 'us-east-1' AND data__Identifier = '<WorkflowName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>id_mapping_workflows</code> in a region.
+```sql
+SELECT
+region,
+workflow_name
+FROM awscc.entityresolution.id_mapping_workflows_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -394,6 +448,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.entityresolution.id_mapping_workflows
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "InputSourceConfig": input_source_config,
+    "IdMappingTechniques": id_mapping_techniques,
+    "OutputSourceConfig": output_source_config,
+    "IdMappingIncrementalRunConfig": id_mapping_incremental_run_config,
+    "RoleArn": role_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<WorkflowName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/entityresolution/id_mapping_workflows_list_only/index.md b/website/docs/services/entityresolution/id_mapping_workflows_list_only/index.md
deleted file mode 100644
index 301af1bd9..000000000
--- a/website/docs/services/entityresolution/id_mapping_workflows_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: id_mapping_workflows_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - id_mapping_workflows_list_only
-  - entityresolution
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>id_mapping_workflows</code> in a region or regions, for all properties use <a href="/services/entityresolution/id_mapping_workflows/"><code>id_mapping_workflows</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>id_mapping_workflows_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>IdMappingWorkflow defined in AWS Entity Resolution service</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.entityresolution.id_mapping_workflows_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "workflow_name",
-    "type": "string",
-    "description": "The name of the IdMappingWorkflow"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>id_mapping_workflows</code> in a region.
-```sql
-SELECT
-region,
-workflow_name
-FROM awscc.entityresolution.id_mapping_workflows_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>id_mapping_workflows_list_only</code> resource, see <a href="/services/entityresolution/id_mapping_workflows/#permissions"><code>id_mapping_workflows</code></a>
-
diff --git a/website/docs/services/entityresolution/id_namespaces/index.md b/website/docs/services/entityresolution/id_namespaces/index.md
index 62491aead..ae679ea5b 100644
--- a/website/docs/services/entityresolution/id_namespaces/index.md
+++ b/website/docs/services/entityresolution/id_namespaces/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>id_namespace</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id_namespace_name",
@@ -172,6 +181,23 @@ Creates, updates, deletes or gets an <code>id_namespace</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id_namespace_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-entityresolution-idnamespace.html"><code>AWS::EntityResolution::IdNamespace</code></a>.
 
@@ -181,31 +207,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>id_namespaces</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IdNamespaceName, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>id_namespaces</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>id_namespaces</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>id_namespaces_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>id_namespaces</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -214,6 +246,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>id_namespace</code>.
 ```sql
 SELECT
@@ -231,6 +272,19 @@ tags
 FROM awscc.entityresolution.id_namespaces
 WHERE region = 'us-east-1' AND data__Identifier = '<IdNamespaceName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>id_namespaces</code> in a region.
+```sql
+SELECT
+region,
+id_namespace_name
+FROM awscc.entityresolution.id_namespaces_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -335,6 +389,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.entityresolution.id_namespaces
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "InputSourceConfig": input_source_config,
+    "IdMappingWorkflowProperties": id_mapping_workflow_properties,
+    "Type": type,
+    "RoleArn": role_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IdNamespaceName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/entityresolution/id_namespaces_list_only/index.md b/website/docs/services/entityresolution/id_namespaces_list_only/index.md
deleted file mode 100644
index 6ef326b54..000000000
--- a/website/docs/services/entityresolution/id_namespaces_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: id_namespaces_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - id_namespaces_list_only
-  - entityresolution
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>id_namespaces</code> in a region or regions, for all properties use <a href="/services/entityresolution/id_namespaces/"><code>id_namespaces</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>id_namespaces_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>IdNamespace defined in AWS Entity Resolution service</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.entityresolution.id_namespaces_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id_namespace_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>id_namespaces</code> in a region.
-```sql
-SELECT
-region,
-id_namespace_name
-FROM awscc.entityresolution.id_namespaces_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>id_namespaces_list_only</code> resource, see <a href="/services/entityresolution/id_namespaces/#permissions"><code>id_namespaces</code></a>
-
diff --git a/website/docs/services/entityresolution/index.md b/website/docs/services/entityresolution/index.md
index 265b94630..e9b003043 100644
--- a/website/docs/services/entityresolution/index.md
+++ b/website/docs/services/entityresolution/index.md
@@ -20,7 +20,7 @@ The entityresolution service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>10</b></span><br />
+<span>total resources:&nbsp;<b>5</b></span><br />
 </div>
 </div>
 
@@ -30,16 +30,11 @@ The entityresolution service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/entityresolution/id_mapping_workflows/">id_mapping_workflows</a><br />
-<a href="/services/entityresolution/id_mapping_workflows_list_only/">id_mapping_workflows_list_only</a><br />
 <a href="/services/entityresolution/id_namespaces/">id_namespaces</a><br />
-<a href="/services/entityresolution/id_namespaces_list_only/">id_namespaces_list_only</a><br />
 <a href="/services/entityresolution/matching_workflows/">matching_workflows</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/entityresolution/matching_workflows_list_only/">matching_workflows_list_only</a><br />
 <a href="/services/entityresolution/policy_statements/">policy_statements</a><br />
-<a href="/services/entityresolution/policy_statements_list_only/">policy_statements_list_only</a><br />
-<a href="/services/entityresolution/schema_mappings/">schema_mappings</a><br />
-<a href="/services/entityresolution/schema_mappings_list_only/">schema_mappings_list_only</a>
+<a href="/services/entityresolution/schema_mappings/">schema_mappings</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/entityresolution/matching_workflows/index.md b/website/docs/services/entityresolution/matching_workflows/index.md
index c918a229e..422707c19 100644
--- a/website/docs/services/entityresolution/matching_workflows/index.md
+++ b/website/docs/services/entityresolution/matching_workflows/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>matching_workflow</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "workflow_name",
@@ -259,6 +268,23 @@ Creates, updates, deletes or gets a <code>matching_workflow</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "workflow_name",
+    "type": "string",
+    "description": "The name of the MatchingWorkflow"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-entityresolution-matchingworkflow.html"><code>AWS::EntityResolution::MatchingWorkflow</code></a>.
 
@@ -268,31 +294,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>matching_workflows</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="WorkflowName, InputSourceConfig, OutputSourceConfig, ResolutionTechniques, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>matching_workflows</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>matching_workflows</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>matching_workflows_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>matching_workflows</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -301,6 +333,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>matching_workflow</code>.
 ```sql
 SELECT
@@ -319,6 +360,19 @@ incremental_run_config
 FROM awscc.entityresolution.matching_workflows
 WHERE region = 'us-east-1' AND data__Identifier = '<WorkflowName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>matching_workflows</code> in a region.
+```sql
+SELECT
+region,
+workflow_name
+FROM awscc.entityresolution.matching_workflows_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -444,6 +498,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.entityresolution.matching_workflows
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "InputSourceConfig": input_source_config,
+    "OutputSourceConfig": output_source_config,
+    "ResolutionTechniques": resolution_techniques,
+    "RoleArn": role_arn,
+    "Tags": tags,
+    "IncrementalRunConfig": incremental_run_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<WorkflowName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/entityresolution/matching_workflows_list_only/index.md b/website/docs/services/entityresolution/matching_workflows_list_only/index.md
deleted file mode 100644
index 7840ace74..000000000
--- a/website/docs/services/entityresolution/matching_workflows_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: matching_workflows_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - matching_workflows_list_only
-  - entityresolution
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>matching_workflows</code> in a region or regions, for all properties use <a href="/services/entityresolution/matching_workflows/"><code>matching_workflows</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>matching_workflows_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>MatchingWorkflow defined in AWS Entity Resolution service</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.entityresolution.matching_workflows_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "workflow_name",
-    "type": "string",
-    "description": "The name of the MatchingWorkflow"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>matching_workflows</code> in a region.
-```sql
-SELECT
-region,
-workflow_name
-FROM awscc.entityresolution.matching_workflows_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>matching_workflows_list_only</code> resource, see <a href="/services/entityresolution/matching_workflows/#permissions"><code>matching_workflows</code></a>
-
diff --git a/website/docs/services/entityresolution/policy_statements/index.md b/website/docs/services/entityresolution/policy_statements/index.md
index 128953f1f..41161e31e 100644
--- a/website/docs/services/entityresolution/policy_statements/index.md
+++ b/website/docs/services/entityresolution/policy_statements/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>policy_statement</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -70,6 +79,28 @@ Creates, updates, deletes or gets a <code>policy_statement</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Arn of the resource to which the policy statement is being attached."
+  },
+  {
+    "name": "statement_id",
+    "type": "string",
+    "description": "The Statement Id of the policy statement that is being attached."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-entityresolution-policystatement.html"><code>AWS::EntityResolution::PolicyStatement</code></a>.
 
@@ -79,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>policy_statements</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Arn, StatementId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>policy_statements</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>policy_statements</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>policy_statements_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>policy_statements</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>policy_statement</code>.
 ```sql
 SELECT
@@ -125,6 +171,20 @@ condition
 FROM awscc.entityresolution.policy_statements
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>|<StatementId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>policy_statements</code> in a region.
+```sql
+SELECT
+region,
+arn,
+statement_id
+FROM awscc.entityresolution.policy_statements_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -209,6 +269,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.entityresolution.policy_statements
+SET data__PatchDocument = string('{{ {
+    "Effect": effect,
+    "Action": action,
+    "Principal": principal,
+    "Condition": condition
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>|<StatementId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/entityresolution/policy_statements_list_only/index.md b/website/docs/services/entityresolution/policy_statements_list_only/index.md
deleted file mode 100644
index f2b6a3d10..000000000
--- a/website/docs/services/entityresolution/policy_statements_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: policy_statements_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - policy_statements_list_only
-  - entityresolution
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>policy_statements</code> in a region or regions, for all properties use <a href="/services/entityresolution/policy_statements/"><code>policy_statements</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>policy_statements_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Policy Statement defined in AWS Entity Resolution Service</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.entityresolution.policy_statements_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Arn of the resource to which the policy statement is being attached."
-  },
-  {
-    "name": "statement_id",
-    "type": "string",
-    "description": "The Statement Id of the policy statement that is being attached."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>policy_statements</code> in a region.
-```sql
-SELECT
-region,
-arn,
-statement_id
-FROM awscc.entityresolution.policy_statements_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>policy_statements_list_only</code> resource, see <a href="/services/entityresolution/policy_statements/#permissions"><code>policy_statements</code></a>
-
diff --git a/website/docs/services/entityresolution/schema_mappings/index.md b/website/docs/services/entityresolution/schema_mappings/index.md
index a56931e26..ac7073458 100644
--- a/website/docs/services/entityresolution/schema_mappings/index.md
+++ b/website/docs/services/entityresolution/schema_mappings/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>schema_mapping</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "schema_name",
@@ -114,6 +123,23 @@ Creates, updates, deletes or gets a <code>schema_mapping</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "schema_name",
+    "type": "string",
+    "description": "The name of the SchemaMapping"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-entityresolution-schemamapping.html"><code>AWS::EntityResolution::SchemaMapping</code></a>.
 
@@ -123,31 +149,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>schema_mappings</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SchemaName, MappedInputFields, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>schema_mappings</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>schema_mappings</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>schema_mappings_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>schema_mappings</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +188,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>schema_mapping</code>.
 ```sql
 SELECT
@@ -171,6 +212,19 @@ has_workflows
 FROM awscc.entityresolution.schema_mappings
 WHERE region = 'us-east-1' AND data__Identifier = '<SchemaName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>schema_mappings</code> in a region.
+```sql
+SELECT
+region,
+schema_name
+FROM awscc.entityresolution.schema_mappings_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -253,6 +307,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.entityresolution.schema_mappings
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "MappedInputFields": mapped_input_fields,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SchemaName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/entityresolution/schema_mappings_list_only/index.md b/website/docs/services/entityresolution/schema_mappings_list_only/index.md
deleted file mode 100644
index ece88179e..000000000
--- a/website/docs/services/entityresolution/schema_mappings_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: schema_mappings_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - schema_mappings_list_only
-  - entityresolution
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>schema_mappings</code> in a region or regions, for all properties use <a href="/services/entityresolution/schema_mappings/"><code>schema_mappings</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>schema_mappings_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>SchemaMapping defined in AWS Entity Resolution service</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.entityresolution.schema_mappings_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "schema_name",
-    "type": "string",
-    "description": "The name of the SchemaMapping"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>schema_mappings</code> in a region.
-```sql
-SELECT
-region,
-schema_name
-FROM awscc.entityresolution.schema_mappings_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>schema_mappings_list_only</code> resource, see <a href="/services/entityresolution/schema_mappings/#permissions"><code>schema_mappings</code></a>
-
diff --git a/website/docs/services/events/api_destinations/index.md b/website/docs/services/events/api_destinations/index.md
index 7219c4e43..828a4c673 100644
--- a/website/docs/services/events/api_destinations/index.md
+++ b/website/docs/services/events/api_destinations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>api_destination</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -80,6 +89,23 @@ Creates, updates, deletes or gets an <code>api_destination</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Name of the apiDestination."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-apidestination.html"><code>AWS::Events::ApiDestination</code></a>.
 
@@ -89,31 +115,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>api_destinations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConnectionArn, InvocationEndpoint, HttpMethod, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>api_destinations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>api_destinations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>api_destinations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>api_destinations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -122,6 +154,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>api_destination</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ http_method
 FROM awscc.events.api_destinations
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>api_destinations</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.events.api_destinations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -221,6 +275,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.events.api_destinations
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "ConnectionArn": connection_arn,
+    "InvocationRateLimitPerSecond": invocation_rate_limit_per_second,
+    "InvocationEndpoint": invocation_endpoint,
+    "HttpMethod": http_method
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/events/api_destinations_list_only/index.md b/website/docs/services/events/api_destinations_list_only/index.md
deleted file mode 100644
index 6912ac20b..000000000
--- a/website/docs/services/events/api_destinations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: api_destinations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - api_destinations_list_only
-  - events
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>api_destinations</code> in a region or regions, for all properties use <a href="/services/events/api_destinations/"><code>api_destinations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>api_destinations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Events::ApiDestination.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.events.api_destinations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Name of the apiDestination."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>api_destinations</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.events.api_destinations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>api_destinations_list_only</code> resource, see <a href="/services/events/api_destinations/#permissions"><code>api_destinations</code></a>
-
diff --git a/website/docs/services/events/archives/index.md b/website/docs/services/events/archives/index.md
index ce184d4ae..476a11db4 100644
--- a/website/docs/services/events/archives/index.md
+++ b/website/docs/services/events/archives/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>archive</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "archive_name",
@@ -75,6 +84,23 @@ Creates, updates, deletes or gets an <code>archive</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "archive_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-archive.html"><code>AWS::Events::Archive</code></a>.
 
@@ -84,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>archives</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SourceArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>archives</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>archives</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>archives_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>archives</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>archive</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ kms_key_identifier
 FROM awscc.events.archives
 WHERE region = 'us-east-1' AND data__Identifier = '<ArchiveName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>archives</code> in a region.
+```sql
+SELECT
+region,
+archive_name
+FROM awscc.events.archives_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -211,6 +265,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.events.archives
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "EventPattern": event_pattern,
+    "RetentionDays": retention_days,
+    "KmsKeyIdentifier": kms_key_identifier
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ArchiveName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/events/archives_list_only/index.md b/website/docs/services/events/archives_list_only/index.md
deleted file mode 100644
index e7f066fa5..000000000
--- a/website/docs/services/events/archives_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: archives_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - archives_list_only
-  - events
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>archives</code> in a region or regions, for all properties use <a href="/services/events/archives/"><code>archives</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>archives_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Events::Archive</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.events.archives_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "archive_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>archives</code> in a region.
-```sql
-SELECT
-region,
-archive_name
-FROM awscc.events.archives_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>archives_list_only</code> resource, see <a href="/services/events/archives/#permissions"><code>archives</code></a>
-
diff --git a/website/docs/services/events/connections/index.md b/website/docs/services/events/connections/index.md
index c476d6a4e..1b6d755e2 100644
--- a/website/docs/services/events/connections/index.md
+++ b/website/docs/services/events/connections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>connection</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -259,6 +268,23 @@ Creates, updates, deletes or gets a <code>connection</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Name of the connection."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-connection.html"><code>AWS::Events::Connection</code></a>.
 
@@ -268,31 +294,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>connections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>connections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -301,6 +333,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>connection</code>.
 ```sql
 SELECT
@@ -317,6 +358,19 @@ kms_key_identifier
 FROM awscc.events.connections
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>connections</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.events.connections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -434,6 +488,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.events.connections
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "AuthorizationType": authorization_type,
+    "KmsKeyIdentifier": kms_key_identifier
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/events/connections_list_only/index.md b/website/docs/services/events/connections_list_only/index.md
deleted file mode 100644
index 3fa646eec..000000000
--- a/website/docs/services/events/connections_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: connections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - connections_list_only
-  - events
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>connections</code> in a region or regions, for all properties use <a href="/services/events/connections/"><code>connections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>connections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Events::Connection.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.events.connections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Name of the connection."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>connections</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.events.connections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>connections_list_only</code> resource, see <a href="/services/events/connections/#permissions"><code>connections</code></a>
-
diff --git a/website/docs/services/events/endpoints/index.md b/website/docs/services/events/endpoints/index.md
index ce201f94d..cf48fb94d 100644
--- a/website/docs/services/events/endpoints/index.md
+++ b/website/docs/services/events/endpoints/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>endpoint</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -142,6 +151,23 @@ Creates, updates, deletes or gets an <code>endpoint</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-endpoint.html"><code>AWS::Events::Endpoint</code></a>.
 
@@ -151,31 +177,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>endpoints</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RoutingConfig, EventBuses, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>endpoints</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>endpoints</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>endpoints_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>endpoints</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -184,6 +216,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>endpoint</code>.
 ```sql
 SELECT
@@ -202,6 +243,19 @@ state_reason
 FROM awscc.events.endpoints
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>endpoints</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.events.endpoints_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -291,6 +345,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.events.endpoints
+SET data__PatchDocument = string('{{ {
+    "RoleArn": role_arn,
+    "Description": description,
+    "RoutingConfig": routing_config,
+    "ReplicationConfig": replication_config,
+    "EventBuses": event_buses
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/events/endpoints_list_only/index.md b/website/docs/services/events/endpoints_list_only/index.md
deleted file mode 100644
index c1665fffe..000000000
--- a/website/docs/services/events/endpoints_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: endpoints_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - endpoints_list_only
-  - events
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>endpoints</code> in a region or regions, for all properties use <a href="/services/events/endpoints/"><code>endpoints</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>endpoints_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Events::Endpoint.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.events.endpoints_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>endpoints</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.events.endpoints_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>endpoints_list_only</code> resource, see <a href="/services/events/endpoints/#permissions"><code>endpoints</code></a>
-
diff --git a/website/docs/services/events/event_bus_policies/index.md b/website/docs/services/events/event_bus_policies/index.md
index 547477150..e41efdc2a 100644
--- a/website/docs/services/events/event_bus_policies/index.md
+++ b/website/docs/services/events/event_bus_policies/index.md
@@ -112,3 +112,4 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 
 
+
diff --git a/website/docs/services/events/event_buses/index.md b/website/docs/services/events/event_buses/index.md
index 268cb0e16..161f14548 100644
--- a/website/docs/services/events/event_buses/index.md
+++ b/website/docs/services/events/event_buses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>event_bus</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "event_source_name",
@@ -116,6 +125,23 @@ Creates, updates, deletes or gets an <code>event_bus</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the event bus."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-eventbus.html"><code>AWS::Events::EventBus</code></a>.
 
@@ -125,31 +151,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>event_buses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>event_buses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>event_buses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>event_buses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>event_buses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -158,6 +190,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>event_bus</code>.
 ```sql
 SELECT
@@ -174,6 +215,19 @@ log_config
 FROM awscc.events.event_buses
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>event_buses</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.events.event_buses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -267,6 +321,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.events.event_buses
+SET data__PatchDocument = string('{{ {
+    "EventSourceName": event_source_name,
+    "Tags": tags,
+    "Description": description,
+    "KmsKeyIdentifier": kms_key_identifier,
+    "Policy": policy,
+    "DeadLetterConfig": dead_letter_config,
+    "LogConfig": log_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/events/event_buses_list_only/index.md b/website/docs/services/events/event_buses_list_only/index.md
deleted file mode 100644
index ee9ca33e0..000000000
--- a/website/docs/services/events/event_buses_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: event_buses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - event_buses_list_only
-  - events
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>event_buses</code> in a region or regions, for all properties use <a href="/services/events/event_buses/"><code>event_buses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>event_buses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::Events::EventBus</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.events.event_buses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the event bus."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>event_buses</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.events.event_buses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>event_buses_list_only</code> resource, see <a href="/services/events/event_buses/#permissions"><code>event_buses</code></a>
-
diff --git a/website/docs/services/events/index.md b/website/docs/services/events/index.md
index 72fac4758..b8192a21e 100644
--- a/website/docs/services/events/index.md
+++ b/website/docs/services/events/index.md
@@ -20,7 +20,7 @@ The events service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>13</b></span><br />
+<span>total resources:&nbsp;<b>7</b></span><br />
 </div>
 </div>
 
@@ -30,19 +30,13 @@ The events service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/events/api_destinations/">api_destinations</a><br />
-<a href="/services/events/api_destinations_list_only/">api_destinations_list_only</a><br />
 <a href="/services/events/archives/">archives</a><br />
-<a href="/services/events/archives_list_only/">archives_list_only</a><br />
 <a href="/services/events/connections/">connections</a><br />
-<a href="/services/events/connections_list_only/">connections_list_only</a><br />
 <a href="/services/events/endpoints/">endpoints</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/events/endpoints_list_only/">endpoints_list_only</a><br />
 <a href="/services/events/event_bus_policies/">event_bus_policies</a><br />
 <a href="/services/events/event_buses/">event_buses</a><br />
-<a href="/services/events/event_buses_list_only/">event_buses_list_only</a><br />
-<a href="/services/events/rules/">rules</a><br />
-<a href="/services/events/rules_list_only/">rules_list_only</a>
+<a href="/services/events/rules/">rules</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/events/rules/index.md b/website/docs/services/events/rules/index.md
index 7137d8562..c69df1c57 100644
--- a/website/docs/services/events/rules/index.md
+++ b/website/docs/services/events/rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>rule</code> resource or lists <code>ru
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "event_bus_name",
@@ -501,6 +510,23 @@ Creates, updates, deletes or gets a <code>rule</code> resource or lists <code>ru
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The ARN of the rule, such as arn:aws:events:us-east-2:123456789012:rule/example."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html"><code>AWS::Events::Rule</code></a>.
 
@@ -510,31 +536,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -543,6 +575,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>rule</code>.
 ```sql
 SELECT
@@ -560,6 +601,19 @@ name
 FROM awscc.events.rules
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>rules</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.events.rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -748,6 +802,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.events.rules
+SET data__PatchDocument = string('{{ {
+    "EventBusName": event_bus_name,
+    "EventPattern": event_pattern,
+    "ScheduleExpression": schedule_expression,
+    "Description": description,
+    "State": state,
+    "Targets": targets,
+    "RoleArn": role_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/events/rules_list_only/index.md b/website/docs/services/events/rules_list_only/index.md
deleted file mode 100644
index 24e0d57ba..000000000
--- a/website/docs/services/events/rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - rules_list_only
-  - events
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>rules</code> in a region or regions, for all properties use <a href="/services/events/rules/"><code>rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Events::Rule</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.events.rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The ARN of the rule, such as arn:aws:events:us-east-2:123456789012:rule/example."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>rules</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.events.rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>rules_list_only</code> resource, see <a href="/services/events/rules/#permissions"><code>rules</code></a>
-
diff --git a/website/docs/services/eventschemas/discoverers/index.md b/website/docs/services/eventschemas/discoverers/index.md
index 726241b09..6b0e2879f 100644
--- a/website/docs/services/eventschemas/discoverers/index.md
+++ b/website/docs/services/eventschemas/discoverers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>discoverer</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "discoverer_arn",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>discoverer</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "discoverer_arn",
+    "type": "string",
+    "description": "The ARN of the discoverer."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-discoverer.html"><code>AWS::EventSchemas::Discoverer</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>discoverers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SourceArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>discoverers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>discoverers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>discoverers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>discoverers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>discoverer</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.eventschemas.discoverers
 WHERE region = 'us-east-1' AND data__Identifier = '<DiscovererArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>discoverers</code> in a region.
+```sql
+SELECT
+region,
+discoverer_arn
+FROM awscc.eventschemas.discoverers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +271,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.eventschemas.discoverers
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "CrossAccount": cross_account,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DiscovererArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/eventschemas/discoverers_list_only/index.md b/website/docs/services/eventschemas/discoverers_list_only/index.md
deleted file mode 100644
index be54d5870..000000000
--- a/website/docs/services/eventschemas/discoverers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: discoverers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - discoverers_list_only
-  - eventschemas
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>discoverers</code> in a region or regions, for all properties use <a href="/services/eventschemas/discoverers/"><code>discoverers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>discoverers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EventSchemas::Discoverer</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.eventschemas.discoverers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "discoverer_arn",
-    "type": "string",
-    "description": "The ARN of the discoverer."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>discoverers</code> in a region.
-```sql
-SELECT
-region,
-discoverer_arn
-FROM awscc.eventschemas.discoverers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>discoverers_list_only</code> resource, see <a href="/services/eventschemas/discoverers/#permissions"><code>discoverers</code></a>
-
diff --git a/website/docs/services/eventschemas/index.md b/website/docs/services/eventschemas/index.md
index aa81db455..4834e9b6f 100644
--- a/website/docs/services/eventschemas/index.md
+++ b/website/docs/services/eventschemas/index.md
@@ -20,7 +20,7 @@ The eventschemas service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>7</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,13 +30,10 @@ The eventschemas service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/eventschemas/discoverers/">discoverers</a><br />
-<a href="/services/eventschemas/discoverers_list_only/">discoverers_list_only</a><br />
-<a href="/services/eventschemas/registries/">registries</a><br />
-<a href="/services/eventschemas/registries_list_only/">registries_list_only</a>
+<a href="/services/eventschemas/registries/">registries</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/eventschemas/registry_policies/">registry_policies</a><br />
-<a href="/services/eventschemas/schemata/">schemata</a><br />
-<a href="/services/eventschemas/schemata_list_only/">schemata_list_only</a>
+<a href="/services/eventschemas/schemata/">schemata</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/eventschemas/registries/index.md b/website/docs/services/eventschemas/registries/index.md
index b0118e110..49938307f 100644
--- a/website/docs/services/eventschemas/registries/index.md
+++ b/website/docs/services/eventschemas/registries/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>registry</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "registry_name",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>registry</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "registry_arn",
+    "type": "string",
+    "description": "The ARN of the registry."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-registry.html"><code>AWS::EventSchemas::Registry</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>registries</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>registries</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>registries</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>registries_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>registries</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>registry</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ tags
 FROM awscc.eventschemas.registries
 WHERE region = 'us-east-1' AND data__Identifier = '<RegistryArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>registries</code> in a region.
+```sql
+SELECT
+region,
+registry_arn
+FROM awscc.eventschemas.registries_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -199,6 +253,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.eventschemas.registries
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RegistryArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/eventschemas/registries_list_only/index.md b/website/docs/services/eventschemas/registries_list_only/index.md
deleted file mode 100644
index 232d50240..000000000
--- a/website/docs/services/eventschemas/registries_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: registries_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - registries_list_only
-  - eventschemas
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>registries</code> in a region or regions, for all properties use <a href="/services/eventschemas/registries/"><code>registries</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>registries_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EventSchemas::Registry</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.eventschemas.registries_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "registry_arn",
-    "type": "string",
-    "description": "The ARN of the registry."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>registries</code> in a region.
-```sql
-SELECT
-region,
-registry_arn
-FROM awscc.eventschemas.registries_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>registries_list_only</code> resource, see <a href="/services/eventschemas/registries/#permissions"><code>registries</code></a>
-
diff --git a/website/docs/services/eventschemas/registry_policies/index.md b/website/docs/services/eventschemas/registry_policies/index.md
index dd9d79f39..42ca3dfde 100644
--- a/website/docs/services/eventschemas/registry_policies/index.md
+++ b/website/docs/services/eventschemas/registry_policies/index.md
@@ -178,6 +178,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.eventschemas.registry_policies
+SET data__PatchDocument = string('{{ {
+    "Policy": policy,
+    "RegistryName": registry_name,
+    "RevisionId": revision_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/eventschemas/schemata/index.md b/website/docs/services/eventschemas/schemata/index.md
index f14391884..3f1ed7cca 100644
--- a/website/docs/services/eventschemas/schemata/index.md
+++ b/website/docs/services/eventschemas/schemata/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>schema</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "type",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets a <code>schema</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "schema_arn",
+    "type": "string",
+    "description": "The ARN of the schema."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-schema.html"><code>AWS::EventSchemas::Schema</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>schemata</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, Content, RegistryName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>schemata</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>schemata</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>schemata_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>schemata</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>schema</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ tags
 FROM awscc.eventschemas.schemata
 WHERE region = 'us-east-1' AND data__Identifier = '<SchemaArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>schemata</code> in a region.
+```sql
+SELECT
+region,
+schema_arn
+FROM awscc.eventschemas.schemata_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -247,6 +301,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.eventschemas.schemata
+SET data__PatchDocument = string('{{ {
+    "Type": type,
+    "Description": description,
+    "Content": content,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SchemaArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/eventschemas/schemata_list_only/index.md b/website/docs/services/eventschemas/schemata_list_only/index.md
deleted file mode 100644
index 42fc039b2..000000000
--- a/website/docs/services/eventschemas/schemata_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: schemata_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - schemata_list_only
-  - eventschemas
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>schemata</code> in a region or regions, for all properties use <a href="/services/eventschemas/schemata/"><code>schemata</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>schemata_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::EventSchemas::Schema</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.eventschemas.schemata_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "schema_arn",
-    "type": "string",
-    "description": "The ARN of the schema."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>schemata</code> in a region.
-```sql
-SELECT
-region,
-schema_arn
-FROM awscc.eventschemas.schemata_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>schemata_list_only</code> resource, see <a href="/services/eventschemas/schemata/#permissions"><code>schemata</code></a>
-
diff --git a/website/docs/services/evidently/experiments/index.md b/website/docs/services/evidently/experiments/index.md
index 4db12f096..a3b6fca6a 100644
--- a/website/docs/services/evidently/experiments/index.md
+++ b/website/docs/services/evidently/experiments/index.md
@@ -406,6 +406,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.evidently.experiments
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "RunningStatus": running_status,
+    "RandomizationSalt": randomization_salt,
+    "Treatments": treatments,
+    "MetricGoals": metric_goals,
+    "SamplingRate": sampling_rate,
+    "OnlineAbConfig": online_ab_config,
+    "Segment": segment,
+    "RemoveSegment": remove_segment,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/evidently/features/index.md b/website/docs/services/evidently/features/index.md
index 477b9c114..064d0ffe7 100644
--- a/website/docs/services/evidently/features/index.md
+++ b/website/docs/services/evidently/features/index.md
@@ -290,6 +290,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.evidently.features
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "EvaluationStrategy": evaluation_strategy,
+    "Variations": variations,
+    "DefaultVariation": default_variation,
+    "EntityOverrides": entity_overrides,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/evidently/index.md b/website/docs/services/evidently/index.md
index db42f1dbe..056080813 100644
--- a/website/docs/services/evidently/index.md
+++ b/website/docs/services/evidently/index.md
@@ -20,7 +20,7 @@ The evidently service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>5</b></span><br />
 </div>
 </div>
 
@@ -35,7 +35,6 @@ The evidently service documentation.
 </div>
 <div class="providerDocColumn">
 <a href="/services/evidently/projects/">projects</a><br />
-<a href="/services/evidently/segments/">segments</a><br />
-<a href="/services/evidently/segments_list_only/">segments_list_only</a>
+<a href="/services/evidently/segments/">segments</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/evidently/launches/index.md b/website/docs/services/evidently/launches/index.md
index 7cbe8ac55..ba56669aa 100644
--- a/website/docs/services/evidently/launches/index.md
+++ b/website/docs/services/evidently/launches/index.md
@@ -389,6 +389,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.evidently.launches
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "RandomizationSalt": randomization_salt,
+    "ScheduledSplitsConfig": scheduled_splits_config,
+    "Groups": groups,
+    "MetricMonitors": metric_monitors,
+    "Tags": tags,
+    "ExecutionStatus": execution_status
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/evidently/projects/index.md b/website/docs/services/evidently/projects/index.md
index a0038d95c..05d1b91f5 100644
--- a/website/docs/services/evidently/projects/index.md
+++ b/website/docs/services/evidently/projects/index.md
@@ -252,6 +252,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.evidently.projects
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "DataDelivery": data_delivery,
+    "AppConfigResource": app_config_resource,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/evidently/segments/index.md b/website/docs/services/evidently/segments/index.md
index 8973466c2..969b5a7b7 100644
--- a/website/docs/services/evidently/segments/index.md
+++ b/website/docs/services/evidently/segments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>segment</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>segment</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-segment.html"><code>AWS::Evidently::Segment</code></a>.
 
@@ -86,26 +112,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>segments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>segments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>segments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>segments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +145,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>segment</code>.
 ```sql
 SELECT
@@ -126,6 +166,19 @@ tags
 FROM awscc.evidently.segments
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>segments</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.evidently.segments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -200,6 +253,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/evidently/segments_list_only/index.md b/website/docs/services/evidently/segments_list_only/index.md
deleted file mode 100644
index 861d1ca1e..000000000
--- a/website/docs/services/evidently/segments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: segments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - segments_list_only
-  - evidently
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>segments</code> in a region or regions, for all properties use <a href="/services/evidently/segments/"><code>segments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>segments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Evidently::Segment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.evidently.segments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>segments</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.evidently.segments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>segments_list_only</code> resource, see <a href="/services/evidently/segments/#permissions"><code>segments</code></a>
-
diff --git a/website/docs/services/evs/environments/index.md b/website/docs/services/evs/environments/index.md
index d41fe2a59..fbc0315e8 100644
--- a/website/docs/services/evs/environments/index.md
+++ b/website/docs/services/evs/environments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "environment_name",
@@ -255,6 +264,23 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "environment_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evs-environment.html"><code>AWS::EVS::Environment</code></a>.
 
@@ -264,31 +290,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VpcId, ServiceAccessSubnetId, VcfVersion, TermsAccepted, LicenseInfo, ConnectivityInfo, VcfHostnames, SiteId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>environments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -297,6 +329,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>environment</code>.
 ```sql
 SELECT
@@ -326,6 +367,19 @@ modified_at
 FROM awscc.evs.environments
 WHERE region = 'us-east-1' AND data__Identifier = '<EnvironmentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>environments</code> in a region.
+```sql
+SELECT
+region,
+environment_id
+FROM awscc.evs.environments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -485,6 +539,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.evs.environments
+SET data__PatchDocument = string('{{ {
+    "InitialVlans": initial_vlans,
+    "Hosts": hosts,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<EnvironmentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/evs/environments_list_only/index.md b/website/docs/services/evs/environments_list_only/index.md
deleted file mode 100644
index e0689f128..000000000
--- a/website/docs/services/evs/environments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: environments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - environments_list_only
-  - evs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>environments</code> in a region or regions, for all properties use <a href="/services/evs/environments/"><code>environments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>environments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An environment created within the EVS service</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.evs.environments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "environment_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>environments</code> in a region.
-```sql
-SELECT
-region,
-environment_id
-FROM awscc.evs.environments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>environments_list_only</code> resource, see <a href="/services/evs/environments/#permissions"><code>environments</code></a>
-
diff --git a/website/docs/services/evs/index.md b/website/docs/services/evs/index.md
index d7ad244ed..fe9b98daf 100644
--- a/website/docs/services/evs/index.md
+++ b/website/docs/services/evs/index.md
@@ -20,7 +20,7 @@ The evs service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The evs service documentation.
 <a href="/services/evs/environments/">environments</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/evs/environments_list_only/">environments_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/finspace/environments/index.md b/website/docs/services/finspace/environments/index.md
index 622fd7c84..ab2e0d232 100644
--- a/website/docs/services/finspace/environments/index.md
+++ b/website/docs/services/finspace/environments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "environment_id",
@@ -188,6 +197,23 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "environment_id",
+    "type": "string",
+    "description": "Unique identifier for representing FinSpace Environment"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-finspace-environment.html"><code>AWS::FinSpace::Environment</code></a>.
 
@@ -197,31 +223,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>environments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -230,6 +262,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>environment</code>.
 ```sql
 SELECT
@@ -252,6 +293,19 @@ tags
 FROM awscc.finspace.environments
 WHERE region = 'us-east-1' AND data__Identifier = '<EnvironmentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>environments</code> in a region.
+```sql
+SELECT
+region,
+environment_id
+FROM awscc.finspace.environments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -354,6 +408,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.finspace.environments
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "FederationMode": federation_mode
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<EnvironmentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/finspace/environments_list_only/index.md b/website/docs/services/finspace/environments_list_only/index.md
deleted file mode 100644
index 46fd8b3e8..000000000
--- a/website/docs/services/finspace/environments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: environments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - environments_list_only
-  - finspace
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>environments</code> in a region or regions, for all properties use <a href="/services/finspace/environments/"><code>environments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>environments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An example resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.finspace.environments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "environment_id",
-    "type": "string",
-    "description": "Unique identifier for representing FinSpace Environment"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>environments</code> in a region.
-```sql
-SELECT
-region,
-environment_id
-FROM awscc.finspace.environments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>environments_list_only</code> resource, see <a href="/services/finspace/environments/#permissions"><code>environments</code></a>
-
diff --git a/website/docs/services/finspace/index.md b/website/docs/services/finspace/index.md
index 7402af08b..70a066aed 100644
--- a/website/docs/services/finspace/index.md
+++ b/website/docs/services/finspace/index.md
@@ -20,7 +20,7 @@ The finspace service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The finspace service documentation.
 <a href="/services/finspace/environments/">environments</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/finspace/environments_list_only/">environments_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/fis/experiment_templates/index.md b/website/docs/services/fis/experiment_templates/index.md
index 20dd86b59..4db121e1a 100644
--- a/website/docs/services/fis/experiment_templates/index.md
+++ b/website/docs/services/fis/experiment_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>experiment_template</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -205,6 +214,23 @@ Creates, updates, deletes or gets an <code>experiment_template</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fis-experimenttemplate.html"><code>AWS::FIS::ExperimentTemplate</code></a>.
 
@@ -214,31 +240,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>experiment_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Description, StopConditions, Targets, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>experiment_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>experiment_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>experiment_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>experiment_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -247,6 +279,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>experiment_template</code>.
 ```sql
 SELECT
@@ -264,6 +305,19 @@ experiment_report_configuration
 FROM awscc.fis.experiment_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>experiment_templates</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.fis.experiment_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -381,6 +435,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.fis.experiment_templates
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Targets": targets,
+    "Actions": actions,
+    "StopConditions": stop_conditions,
+    "LogConfiguration": log_configuration,
+    "RoleArn": role_arn,
+    "Tags": tags,
+    "ExperimentReportConfiguration": experiment_report_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/fis/experiment_templates_list_only/index.md b/website/docs/services/fis/experiment_templates_list_only/index.md
deleted file mode 100644
index ec5d920cd..000000000
--- a/website/docs/services/fis/experiment_templates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: experiment_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - experiment_templates_list_only
-  - fis
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>experiment_templates</code> in a region or regions, for all properties use <a href="/services/fis/experiment_templates/"><code>experiment_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>experiment_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::FIS::ExperimentTemplate</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.fis.experiment_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>experiment_templates</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.fis.experiment_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>experiment_templates_list_only</code> resource, see <a href="/services/fis/experiment_templates/#permissions"><code>experiment_templates</code></a>
-
diff --git a/website/docs/services/fis/index.md b/website/docs/services/fis/index.md
index ab123cbff..627872a29 100644
--- a/website/docs/services/fis/index.md
+++ b/website/docs/services/fis/index.md
@@ -20,7 +20,7 @@ The fis service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The fis service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/fis/experiment_templates/">experiment_templates</a><br />
-<a href="/services/fis/experiment_templates_list_only/">experiment_templates_list_only</a>
+<a href="/services/fis/experiment_templates/">experiment_templates</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/fis/target_account_configurations/">target_account_configurations</a><br />
-<a href="/services/fis/target_account_configurations_list_only/">target_account_configurations_list_only</a>
+<a href="/services/fis/target_account_configurations/">target_account_configurations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/fis/target_account_configurations/index.md b/website/docs/services/fis/target_account_configurations/index.md
index 15d6dcdc8..c2ce13117 100644
--- a/website/docs/services/fis/target_account_configurations/index.md
+++ b/website/docs/services/fis/target_account_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>target_account_configuration</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "experiment_template_id",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets a <code>target_account_configuration</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "experiment_template_id",
+    "type": "string",
+    "description": "The ID of the experiment template."
+  },
+  {
+    "name": "account_id",
+    "type": "string",
+    "description": "The AWS account ID of the target account."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fis-targetaccountconfiguration.html"><code>AWS::FIS::TargetAccountConfiguration</code></a>.
 
@@ -69,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>target_account_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ExperimentTemplateId, AccountId, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>target_account_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>target_account_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>target_account_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>target_account_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>target_account_configuration</code>.
 ```sql
 SELECT
@@ -113,6 +159,20 @@ description
 FROM awscc.fis.target_account_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<ExperimentTemplateId>|<AccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>target_account_configurations</code> in a region.
+```sql
+SELECT
+region,
+experiment_template_id,
+account_id
+FROM awscc.fis.target_account_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -189,6 +249,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.fis.target_account_configurations
+SET data__PatchDocument = string('{{ {
+    "RoleArn": role_arn,
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ExperimentTemplateId>|<AccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/fis/target_account_configurations_list_only/index.md b/website/docs/services/fis/target_account_configurations_list_only/index.md
deleted file mode 100644
index 4e05d8dec..000000000
--- a/website/docs/services/fis/target_account_configurations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: target_account_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - target_account_configurations_list_only
-  - fis
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>target_account_configurations</code> in a region or regions, for all properties use <a href="/services/fis/target_account_configurations/"><code>target_account_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>target_account_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::FIS::TargetAccountConfiguration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.fis.target_account_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "experiment_template_id",
-    "type": "string",
-    "description": "The ID of the experiment template."
-  },
-  {
-    "name": "account_id",
-    "type": "string",
-    "description": "The AWS account ID of the target account."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>target_account_configurations</code> in a region.
-```sql
-SELECT
-region,
-experiment_template_id,
-account_id
-FROM awscc.fis.target_account_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>target_account_configurations_list_only</code> resource, see <a href="/services/fis/target_account_configurations/#permissions"><code>target_account_configurations</code></a>
-
diff --git a/website/docs/services/fms/index.md b/website/docs/services/fms/index.md
index d48a8ba7b..2d7089988 100644
--- a/website/docs/services/fms/index.md
+++ b/website/docs/services/fms/index.md
@@ -20,7 +20,7 @@ The fms service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The fms service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/fms/notification_channels/">notification_channels</a><br />
-<a href="/services/fms/notification_channels_list_only/">notification_channels_list_only</a><br />
 <a href="/services/fms/policies/">policies</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/fms/policies_list_only/">policies_list_only</a><br />
-<a href="/services/fms/resource_sets/">resource_sets</a><br />
-<a href="/services/fms/resource_sets_list_only/">resource_sets_list_only</a>
+<a href="/services/fms/resource_sets/">resource_sets</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/fms/notification_channels/index.md b/website/docs/services/fms/notification_channels/index.md
index d809916f7..33ffcb042 100644
--- a/website/docs/services/fms/notification_channels/index.md
+++ b/website/docs/services/fms/notification_channels/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>notification_channel</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "sns_role_name",
@@ -45,6 +54,18 @@ Creates, updates, deletes or gets a <code>notification_channel</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-notificationchannel.html"><code>AWS::FMS::NotificationChannel</code></a>.
 
@@ -54,31 +75,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>notification_channels</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SnsRoleName, SnsTopicArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>notification_channels</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>notification_channels</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>notification_channels_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>notification_channels</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +114,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>notification_channel</code>.
 ```sql
 SELECT
@@ -96,6 +132,19 @@ sns_topic_arn
 FROM awscc.fms.notification_channels
 WHERE region = 'us-east-1' AND data__Identifier = '<SnsTopicArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>notification_channels</code> in a region.
+```sql
+SELECT
+region,
+sns_topic_arn
+FROM awscc.fms.notification_channels_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -162,6 +211,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.fms.notification_channels
+SET data__PatchDocument = string('{{ {
+    "SnsRoleName": sns_role_name,
+    "SnsTopicArn": sns_topic_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SnsTopicArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/fms/notification_channels_list_only/index.md b/website/docs/services/fms/notification_channels_list_only/index.md
deleted file mode 100644
index cdadbdcbe..000000000
--- a/website/docs/services/fms/notification_channels_list_only/index.md
+++ /dev/null
@@ -1,75 +0,0 @@
----
-title: notification_channels_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - notification_channels_list_only
-  - fms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>notification_channels</code> in a region or regions, for all properties use <a href="/services/fms/notification_channels/"><code>notification_channels</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>notification_channels_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Designates the IAM role and Amazon Simple Notification Service (SNS) topic that AWS Firewall Manager uses to record SNS logs.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.fms.notification_channels_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>notification_channels</code> in a region.
-```sql
-SELECT
-region,
-sns_topic_arn
-FROM awscc.fms.notification_channels_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>notification_channels_list_only</code> resource, see <a href="/services/fms/notification_channels/#permissions"><code>notification_channels</code></a>
-
diff --git a/website/docs/services/fms/policies/index.md b/website/docs/services/fms/policies/index.md
index c3c22db4a..bc283b558 100644
--- a/website/docs/services/fms/policies/index.md
+++ b/website/docs/services/fms/policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>policy</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "exclude_map",
@@ -211,6 +220,23 @@ Creates, updates, deletes or gets a <code>policy</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-policy.html"><code>AWS::FMS::Policy</code></a>.
 
@@ -220,31 +246,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ExcludeResourceTags, PolicyName, RemediationEnabled, SecurityServicePolicyData, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -253,6 +285,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>policy</code>.
 ```sql
 SELECT
@@ -277,6 +318,19 @@ tags
 FROM awscc.fms.policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>policies</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.fms.policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -433,6 +487,33 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.fms.policies
+SET data__PatchDocument = string('{{ {
+    "ExcludeMap": exclude_map,
+    "ExcludeResourceTags": exclude_resource_tags,
+    "IncludeMap": include_map,
+    "PolicyName": policy_name,
+    "PolicyDescription": policy_description,
+    "RemediationEnabled": remediation_enabled,
+    "ResourceTags": resource_tags,
+    "ResourceTagLogicalOperator": resource_tag_logical_operator,
+    "ResourceType": resource_type,
+    "ResourceTypeList": resource_type_list,
+    "ResourceSetIds": resource_set_ids,
+    "SecurityServicePolicyData": security_service_policy_data,
+    "DeleteAllPolicyResources": delete_all_policy_resources,
+    "ResourcesCleanUp": resources_clean_up,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/fms/policies_list_only/index.md b/website/docs/services/fms/policies_list_only/index.md
deleted file mode 100644
index 9456a9ff4..000000000
--- a/website/docs/services/fms/policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - policies_list_only
-  - fms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>policies</code> in a region or regions, for all properties use <a href="/services/fms/policies/"><code>policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates an AWS Firewall Manager policy.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.fms.policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>policies</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.fms.policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>policies_list_only</code> resource, see <a href="/services/fms/policies/#permissions"><code>policies</code></a>
-
diff --git a/website/docs/services/fms/resource_sets/index.md b/website/docs/services/fms/resource_sets/index.md
index 57c3bbc81..64d5da18e 100644
--- a/website/docs/services/fms/resource_sets/index.md
+++ b/website/docs/services/fms/resource_sets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_set</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>resource_set</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "A Base62 ID"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-resourceset.html"><code>AWS::FMS::ResourceSet</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_sets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, ResourceTypeList, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_sets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_sets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_sets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_sets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_set</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.fms.resource_sets
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_sets</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.fms.resource_sets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.fms.resource_sets
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "ResourceTypeList": resource_type_list,
+    "Resources": resources,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/fms/resource_sets_list_only/index.md b/website/docs/services/fms/resource_sets_list_only/index.md
deleted file mode 100644
index c3d234ef5..000000000
--- a/website/docs/services/fms/resource_sets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_sets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_sets_list_only
-  - fms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_sets</code> in a region or regions, for all properties use <a href="/services/fms/resource_sets/"><code>resource_sets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_sets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates an AWS Firewall Manager resource set.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.fms.resource_sets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "A Base62 ID"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_sets</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.fms.resource_sets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_sets_list_only</code> resource, see <a href="/services/fms/resource_sets/#permissions"><code>resource_sets</code></a>
-
diff --git a/website/docs/services/forecast/dataset_groups/index.md b/website/docs/services/forecast/dataset_groups/index.md
index cf4be3455..bfd6518d4 100644
--- a/website/docs/services/forecast/dataset_groups/index.md
+++ b/website/docs/services/forecast/dataset_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>dataset_group</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "dataset_arns",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>dataset_group</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "dataset_group_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the dataset group to delete."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-forecast-datasetgroup.html"><code>AWS::Forecast::DatasetGroup</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>dataset_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DatasetGroupName, Domain, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>dataset_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>dataset_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>dataset_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>dataset_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dataset_group</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ dataset_group_arn
 FROM awscc.forecast.dataset_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<DatasetGroupArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>dataset_groups</code> in a region.
+```sql
+SELECT
+region,
+dataset_group_arn
+FROM awscc.forecast.dataset_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -208,6 +262,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.forecast.dataset_groups
+SET data__PatchDocument = string('{{ {
+    "DatasetArns": dataset_arns,
+    "Domain": domain,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DatasetGroupArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/forecast/dataset_groups_list_only/index.md b/website/docs/services/forecast/dataset_groups_list_only/index.md
deleted file mode 100644
index 1748c82da..000000000
--- a/website/docs/services/forecast/dataset_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: dataset_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - dataset_groups_list_only
-  - forecast
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>dataset_groups</code> in a region or regions, for all properties use <a href="/services/forecast/dataset_groups/"><code>dataset_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>dataset_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a dataset group that holds a collection of related datasets</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.forecast.dataset_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "dataset_group_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the dataset group to delete."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>dataset_groups</code> in a region.
-```sql
-SELECT
-region,
-dataset_group_arn
-FROM awscc.forecast.dataset_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>dataset_groups_list_only</code> resource, see <a href="/services/forecast/dataset_groups/#permissions"><code>dataset_groups</code></a>
-
diff --git a/website/docs/services/forecast/datasets/index.md b/website/docs/services/forecast/datasets/index.md
index 8183dd598..da74d33d8 100644
--- a/website/docs/services/forecast/datasets/index.md
+++ b/website/docs/services/forecast/datasets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>dataset</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -123,6 +132,23 @@ Creates, updates, deletes or gets a <code>dataset</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-forecast-dataset.html"><code>AWS::Forecast::Dataset</code></a>.
 
@@ -132,26 +158,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DatasetName, DatasetType, Domain, Schema, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>datasets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -160,6 +191,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dataset</code>.
 ```sql
 SELECT
@@ -175,6 +215,19 @@ tags
 FROM awscc.forecast.datasets
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>datasets</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.forecast.datasets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -272,6 +325,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/forecast/datasets_list_only/index.md b/website/docs/services/forecast/datasets_list_only/index.md
deleted file mode 100644
index d49bfad03..000000000
--- a/website/docs/services/forecast/datasets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: datasets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - datasets_list_only
-  - forecast
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>datasets</code> in a region or regions, for all properties use <a href="/services/forecast/datasets/"><code>datasets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>datasets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type Definition for AWS::Forecast::Dataset</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.forecast.datasets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>datasets</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.forecast.datasets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>datasets_list_only</code> resource, see <a href="/services/forecast/datasets/#permissions"><code>datasets</code></a>
-
diff --git a/website/docs/services/forecast/index.md b/website/docs/services/forecast/index.md
index a0fb7198d..d14e44540 100644
--- a/website/docs/services/forecast/index.md
+++ b/website/docs/services/forecast/index.md
@@ -20,7 +20,7 @@ The forecast service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The forecast service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/forecast/dataset_groups/">dataset_groups</a><br />
-<a href="/services/forecast/dataset_groups_list_only/">dataset_groups_list_only</a>
+<a href="/services/forecast/dataset_groups/">dataset_groups</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/forecast/datasets/">datasets</a><br />
-<a href="/services/forecast/datasets_list_only/">datasets_list_only</a>
+<a href="/services/forecast/datasets/">datasets</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/frauddetector/detectors/index.md b/website/docs/services/frauddetector/detectors/index.md
index 2c88e2943..abafddff3 100644
--- a/website/docs/services/frauddetector/detectors/index.md
+++ b/website/docs/services/frauddetector/detectors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>detector</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "detector_id",
@@ -381,6 +390,23 @@ Creates, updates, deletes or gets a <code>detector</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The ARN of the detector."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-detector.html"><code>AWS::FraudDetector::Detector</code></a>.
 
@@ -390,31 +416,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>detectors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DetectorId, EventType, Rules, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>detectors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>detectors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>detectors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>detectors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -423,6 +455,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>detector</code>.
 ```sql
 SELECT
@@ -442,6 +483,19 @@ associated_models
 FROM awscc.frauddetector.detectors
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>detectors</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.frauddetector.detectors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -584,6 +638,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.frauddetector.detectors
+SET data__PatchDocument = string('{{ {
+    "DetectorVersionStatus": detector_version_status,
+    "RuleExecutionMode": rule_execution_mode,
+    "Tags": tags,
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/frauddetector/detectors_list_only/index.md b/website/docs/services/frauddetector/detectors_list_only/index.md
deleted file mode 100644
index 5a6b04d56..000000000
--- a/website/docs/services/frauddetector/detectors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: detectors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - detectors_list_only
-  - frauddetector
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>detectors</code> in a region or regions, for all properties use <a href="/services/frauddetector/detectors/"><code>detectors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>detectors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A resource schema for a Detector in Amazon Fraud Detector.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.frauddetector.detectors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The ARN of the detector."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>detectors</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.frauddetector.detectors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>detectors_list_only</code> resource, see <a href="/services/frauddetector/detectors/#permissions"><code>detectors</code></a>
-
diff --git a/website/docs/services/frauddetector/event_types/index.md b/website/docs/services/frauddetector/event_types/index.md
index 53001770c..133bda1f9 100644
--- a/website/docs/services/frauddetector/event_types/index.md
+++ b/website/docs/services/frauddetector/event_types/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>event_type</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -223,6 +232,23 @@ Creates, updates, deletes or gets an <code>event_type</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The ARN of the event type."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-eventtype.html"><code>AWS::FraudDetector::EventType</code></a>.
 
@@ -232,31 +258,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>event_types</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EntityTypes, EventVariables, Labels, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>event_types</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>event_types</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>event_types_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>event_types</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -265,6 +297,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>event_type</code>.
 ```sql
 SELECT
@@ -281,6 +322,19 @@ last_updated_time
 FROM awscc.frauddetector.event_types
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>event_types</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.frauddetector.event_types_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -393,6 +447,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.frauddetector.event_types
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/frauddetector/event_types_list_only/index.md b/website/docs/services/frauddetector/event_types_list_only/index.md
deleted file mode 100644
index d63555d5c..000000000
--- a/website/docs/services/frauddetector/event_types_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: event_types_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - event_types_list_only
-  - frauddetector
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>event_types</code> in a region or regions, for all properties use <a href="/services/frauddetector/event_types/"><code>event_types</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>event_types_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A resource schema for an EventType in Amazon Fraud Detector.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.frauddetector.event_types_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The ARN of the event type."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>event_types</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.frauddetector.event_types_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>event_types_list_only</code> resource, see <a href="/services/frauddetector/event_types/#permissions"><code>event_types</code></a>
-
diff --git a/website/docs/services/frauddetector/index.md b/website/docs/services/frauddetector/index.md
index 70094a1e9..092f393b1 100644
--- a/website/docs/services/frauddetector/index.md
+++ b/website/docs/services/frauddetector/index.md
@@ -20,7 +20,7 @@ The frauddetector service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>12</b></span><br />
+<span>total resources:&nbsp;<b>6</b></span><br />
 </div>
 </div>
 
@@ -30,18 +30,12 @@ The frauddetector service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/frauddetector/detectors/">detectors</a><br />
-<a href="/services/frauddetector/detectors_list_only/">detectors_list_only</a><br />
 <a href="/services/frauddetector/event_types/">event_types</a><br />
-<a href="/services/frauddetector/event_types_list_only/">event_types_list_only</a><br />
-<a href="/services/frauddetector/labels/">labels</a><br />
-<a href="/services/frauddetector/labels_list_only/">labels_list_only</a>
+<a href="/services/frauddetector/labels/">labels</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/frauddetector/lists/">lists</a><br />
-<a href="/services/frauddetector/lists_list_only/">lists_list_only</a><br />
 <a href="/services/frauddetector/outcomes/">outcomes</a><br />
-<a href="/services/frauddetector/outcomes_list_only/">outcomes_list_only</a><br />
-<a href="/services/frauddetector/variables/">variables</a><br />
-<a href="/services/frauddetector/variables_list_only/">variables_list_only</a>
+<a href="/services/frauddetector/variables/">variables</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/frauddetector/labels/index.md b/website/docs/services/frauddetector/labels/index.md
index 8db7f1f00..cec158a0e 100644
--- a/website/docs/services/frauddetector/labels/index.md
+++ b/website/docs/services/frauddetector/labels/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>label</code> resource or lists <code>l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>label</code> resource or lists <code>l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The label ARN."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-label.html"><code>AWS::FraudDetector::Label</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>labels</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>labels</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>labels</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>labels_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>labels</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>label</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ last_updated_time
 FROM awscc.frauddetector.labels
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>labels</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.frauddetector.labels_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -207,6 +261,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.frauddetector.labels
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/frauddetector/labels_list_only/index.md b/website/docs/services/frauddetector/labels_list_only/index.md
deleted file mode 100644
index bd907b56d..000000000
--- a/website/docs/services/frauddetector/labels_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: labels_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - labels_list_only
-  - frauddetector
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>labels</code> in a region or regions, for all properties use <a href="/services/frauddetector/labels/"><code>labels</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>labels_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An label for fraud detector.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.frauddetector.labels_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The label ARN."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>labels</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.frauddetector.labels_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>labels_list_only</code> resource, see <a href="/services/frauddetector/labels/#permissions"><code>labels</code></a>
-
diff --git a/website/docs/services/frauddetector/lists/index.md b/website/docs/services/frauddetector/lists/index.md
index a2a220d83..64da2e026 100644
--- a/website/docs/services/frauddetector/lists/index.md
+++ b/website/docs/services/frauddetector/lists/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>list</code> resource or lists <code>li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>list</code> resource or lists <code>li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The list ARN."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-list.html"><code>AWS::FraudDetector::List</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>lists</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>lists</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>lists</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>lists_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>lists</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>list</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ elements
 FROM awscc.frauddetector.lists
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>lists</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.frauddetector.lists_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -228,6 +282,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.frauddetector.lists
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "VariableType": variable_type,
+    "Tags": tags,
+    "Elements": elements
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/frauddetector/lists_list_only/index.md b/website/docs/services/frauddetector/lists_list_only/index.md
deleted file mode 100644
index fa4d80a05..000000000
--- a/website/docs/services/frauddetector/lists_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: lists_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - lists_list_only
-  - frauddetector
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>lists</code> in a region or regions, for all properties use <a href="/services/frauddetector/lists/"><code>lists</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>lists_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A resource schema for a List in Amazon Fraud Detector.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.frauddetector.lists_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The list ARN."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>lists</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.frauddetector.lists_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>lists_list_only</code> resource, see <a href="/services/frauddetector/lists/#permissions"><code>lists</code></a>
-
diff --git a/website/docs/services/frauddetector/outcomes/index.md b/website/docs/services/frauddetector/outcomes/index.md
index b307972f1..16dc6beb5 100644
--- a/website/docs/services/frauddetector/outcomes/index.md
+++ b/website/docs/services/frauddetector/outcomes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>outcome</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets an <code>outcome</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The outcome ARN."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-outcome.html"><code>AWS::FraudDetector::Outcome</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>outcomes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>outcomes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>outcomes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>outcomes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>outcomes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>outcome</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ last_updated_time
 FROM awscc.frauddetector.outcomes
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>outcomes</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.frauddetector.outcomes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -207,6 +261,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.frauddetector.outcomes
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/frauddetector/outcomes_list_only/index.md b/website/docs/services/frauddetector/outcomes_list_only/index.md
deleted file mode 100644
index 22b9d6c04..000000000
--- a/website/docs/services/frauddetector/outcomes_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: outcomes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - outcomes_list_only
-  - frauddetector
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>outcomes</code> in a region or regions, for all properties use <a href="/services/frauddetector/outcomes/"><code>outcomes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>outcomes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An outcome for rule evaluation.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.frauddetector.outcomes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The outcome ARN."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>outcomes</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.frauddetector.outcomes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>outcomes_list_only</code> resource, see <a href="/services/frauddetector/outcomes/#permissions"><code>outcomes</code></a>
-
diff --git a/website/docs/services/frauddetector/variables/index.md b/website/docs/services/frauddetector/variables/index.md
index 88c20054f..a1c2e2f65 100644
--- a/website/docs/services/frauddetector/variables/index.md
+++ b/website/docs/services/frauddetector/variables/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>variable</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets a <code>variable</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The ARN of the variable."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-variable.html"><code>AWS::FraudDetector::Variable</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>variables</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DataType, DataSource, DefaultValue, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>variables</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>variables</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>variables_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>variables</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>variable</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ last_updated_time
 FROM awscc.frauddetector.variables
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>variables</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.frauddetector.variables_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -253,6 +307,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.frauddetector.variables
+SET data__PatchDocument = string('{{ {
+    "DataSource": data_source,
+    "DataType": data_type,
+    "DefaultValue": default_value,
+    "Description": description,
+    "Tags": tags,
+    "VariableType": variable_type
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/frauddetector/variables_list_only/index.md b/website/docs/services/frauddetector/variables_list_only/index.md
deleted file mode 100644
index 376df4938..000000000
--- a/website/docs/services/frauddetector/variables_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: variables_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - variables_list_only
-  - frauddetector
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>variables</code> in a region or regions, for all properties use <a href="/services/frauddetector/variables/"><code>variables</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>variables_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A resource schema for a Variable in Amazon Fraud Detector.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.frauddetector.variables_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The ARN of the variable."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>variables</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.frauddetector.variables_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>variables_list_only</code> resource, see <a href="/services/frauddetector/variables/#permissions"><code>variables</code></a>
-
diff --git a/website/docs/services/fsx/data_repository_associations/index.md b/website/docs/services/fsx/data_repository_associations/index.md
index 67bcf575f..fafff6612 100644
--- a/website/docs/services/fsx/data_repository_associations/index.md
+++ b/website/docs/services/fsx/data_repository_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_repository_association</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "association_id",
@@ -123,6 +132,23 @@ Creates, updates, deletes or gets a <code>data_repository_association</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "association_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-datarepositoryassociation.html"><code>AWS::FSx::DataRepositoryAssociation</code></a>.
 
@@ -132,31 +158,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_repository_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FileSystemId, FileSystemPath, DataRepositoryPath, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_repository_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_repository_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_repository_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_repository_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -165,6 +197,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_repository_association</code>.
 ```sql
 SELECT
@@ -181,6 +222,19 @@ tags
 FROM awscc.fsx.data_repository_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<AssociationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_repository_associations</code> in a region.
+```sql
+SELECT
+region,
+association_id
+FROM awscc.fsx.data_repository_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -276,6 +330,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.fsx.data_repository_associations
+SET data__PatchDocument = string('{{ {
+    "ImportedFileChunkSize": imported_file_chunk_size,
+    "S3": s3,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AssociationId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/fsx/data_repository_associations_list_only/index.md b/website/docs/services/fsx/data_repository_associations_list_only/index.md
deleted file mode 100644
index bbfa3d40f..000000000
--- a/website/docs/services/fsx/data_repository_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: data_repository_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_repository_associations_list_only
-  - fsx
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_repository_associations</code> in a region or regions, for all properties use <a href="/services/fsx/data_repository_associations/"><code>data_repository_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_repository_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates an Amazon FSx for Lustre data repository association (DRA). A data repository association is a link between a directory on the file system and an Amazon S3 bucket or prefix. You can have a maximum of 8 data repository associations on a file system. Data repository associations are supported on all FSx for Lustre 2.12 and newer file systems, excluding &#96;&#96;scratch&#95;1&#96;&#96; deployment type. <br />Each data repository association must have a unique Amazon FSx file system directory and a unique S3 bucket or prefix associated with it. You can configure a data repository association for automatic import only, for automatic export only, or for both. To learn more about linking a data repository to your file system, see &#91;Linking your file system to an S3 bucket&#93;(https://docs.aws.amazon.com/fsx/latest/LustreGuide/create-dra-linked-data-repo.html).</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.fsx.data_repository_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "association_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_repository_associations</code> in a region.
-```sql
-SELECT
-region,
-association_id
-FROM awscc.fsx.data_repository_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_repository_associations_list_only</code> resource, see <a href="/services/fsx/data_repository_associations/#permissions"><code>data_repository_associations</code></a>
-
diff --git a/website/docs/services/fsx/index.md b/website/docs/services/fsx/index.md
index f2cd27b06..965a372aa 100644
--- a/website/docs/services/fsx/index.md
+++ b/website/docs/services/fsx/index.md
@@ -20,7 +20,7 @@ The fsx service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The fsx service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/fsx/data_repository_associations/">data_repository_associations</a><br />
-<a href="/services/fsx/data_repository_associations_list_only/">data_repository_associations_list_only</a>
+<a href="/services/fsx/data_repository_associations/">data_repository_associations</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/fsx/s3access_point_attachments/">s3access_point_attachments</a><br />
-<a href="/services/fsx/s3access_point_attachments_list_only/">s3access_point_attachments_list_only</a>
+<a href="/services/fsx/s3access_point_attachments/">s3access_point_attachments</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/fsx/s3access_point_attachments/index.md b/website/docs/services/fsx/s3access_point_attachments/index.md
index 4b6e14dc0..507bcc44e 100644
--- a/website/docs/services/fsx/s3access_point_attachments/index.md
+++ b/website/docs/services/fsx/s3access_point_attachments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>s3access_point_attachment</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -130,6 +139,23 @@ Creates, updates, deletes or gets a <code>s3access_point_attachment</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The Name of the S3AccessPointAttachment"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-s3accesspointattachment.html"><code>AWS::FSx::S3AccessPointAttachment</code></a>.
 
@@ -139,26 +165,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>s3access_point_attachments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Type, OpenZFSConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>s3access_point_attachments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>s3access_point_attachments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>s3access_point_attachments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -167,6 +198,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>s3access_point_attachment</code>.
 ```sql
 SELECT
@@ -178,6 +218,19 @@ s3_access_point
 FROM awscc.fsx.s3access_point_attachments
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>s3access_point_attachments</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.fsx.s3access_point_attachments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -267,6 +320,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/fsx/s3access_point_attachments_list_only/index.md b/website/docs/services/fsx/s3access_point_attachments_list_only/index.md
deleted file mode 100644
index 247fce35a..000000000
--- a/website/docs/services/fsx/s3access_point_attachments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: s3access_point_attachments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - s3access_point_attachments_list_only
-  - fsx
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>s3access_point_attachments</code> in a region or regions, for all properties use <a href="/services/fsx/s3access_point_attachments/"><code>s3access_point_attachments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>s3access_point_attachments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::FSx::S3AccessPointAttachment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.fsx.s3access_point_attachments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The Name of the S3AccessPointAttachment"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>s3access_point_attachments</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.fsx.s3access_point_attachments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>s3access_point_attachments_list_only</code> resource, see <a href="/services/fsx/s3access_point_attachments/#permissions"><code>s3access_point_attachments</code></a>
-
diff --git a/website/docs/services/gamelift/aliases/index.md b/website/docs/services/gamelift/aliases/index.md
index 4206d1e38..4b71a6332 100644
--- a/website/docs/services/gamelift/aliases/index.md
+++ b/website/docs/services/gamelift/aliases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>alias</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -99,6 +108,23 @@ Creates, updates, deletes or gets an <code>alias</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "alias_id",
+    "type": "string",
+    "description": "Unique alias ID"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-alias.html"><code>AWS::GameLift::Alias</code></a>.
 
@@ -108,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, RoutingStrategy, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>aliases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>alias</code>.
 ```sql
 SELECT
@@ -154,6 +195,19 @@ tags
 FROM awscc.gamelift.aliases
 WHERE region = 'us-east-1' AND data__Identifier = '<AliasId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>aliases</code> in a region.
+```sql
+SELECT
+region,
+alias_id
+FROM awscc.gamelift.aliases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -233,6 +287,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.gamelift.aliases
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Name": name,
+    "RoutingStrategy": routing_strategy,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AliasId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/gamelift/aliases_list_only/index.md b/website/docs/services/gamelift/aliases_list_only/index.md
deleted file mode 100644
index dfdcab225..000000000
--- a/website/docs/services/gamelift/aliases_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: aliases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - aliases_list_only
-  - gamelift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>aliases</code> in a region or regions, for all properties use <a href="/services/gamelift/aliases/"><code>aliases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>aliases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::GameLift::Alias resource creates an alias for an Amazon GameLift (GameLift) fleet destination.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.gamelift.aliases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "alias_id",
-    "type": "string",
-    "description": "Unique alias ID"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>aliases</code> in a region.
-```sql
-SELECT
-region,
-alias_id
-FROM awscc.gamelift.aliases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>aliases_list_only</code> resource, see <a href="/services/gamelift/aliases/#permissions"><code>aliases</code></a>
-
diff --git a/website/docs/services/gamelift/builds/index.md b/website/docs/services/gamelift/builds/index.md
index 2ac6066e1..037a106ee 100644
--- a/website/docs/services/gamelift/builds/index.md
+++ b/website/docs/services/gamelift/builds/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>build</code> resource or lists <code>b
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "build_id",
@@ -114,6 +123,23 @@ Creates, updates, deletes or gets a <code>build</code> resource or lists <code>b
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "build_id",
+    "type": "string",
+    "description": "A unique identifier for a build to be deployed on the new fleet. If you are deploying the fleet with a custom game build, you must specify this property. The build must have been successfully uploaded to Amazon GameLift and be in a READY status. This fleet setting cannot be changed once the fleet is created."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-build.html"><code>AWS::GameLift::Build</code></a>.
 
@@ -123,31 +149,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>builds</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>builds</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>builds</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>builds_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>builds</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +188,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>build</code>.
 ```sql
 SELECT
@@ -171,6 +212,19 @@ build_arn
 FROM awscc.gamelift.builds
 WHERE region = 'us-east-1' AND data__Identifier = '<BuildId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>builds</code> in a region.
+```sql
+SELECT
+region,
+build_id
+FROM awscc.gamelift.builds_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -257,6 +311,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.gamelift.builds
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Version": version,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<BuildId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/gamelift/builds_list_only/index.md b/website/docs/services/gamelift/builds_list_only/index.md
deleted file mode 100644
index 8e031d2bb..000000000
--- a/website/docs/services/gamelift/builds_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: builds_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - builds_list_only
-  - gamelift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>builds</code> in a region or regions, for all properties use <a href="/services/gamelift/builds/"><code>builds</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>builds_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::GameLift::Build</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.gamelift.builds_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "build_id",
-    "type": "string",
-    "description": "A unique identifier for a build to be deployed on the new fleet. If you are deploying the fleet with a custom game build, you must specify this property. The build must have been successfully uploaded to Amazon GameLift and be in a READY status. This fleet setting cannot be changed once the fleet is created."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>builds</code> in a region.
-```sql
-SELECT
-region,
-build_id
-FROM awscc.gamelift.builds_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>builds_list_only</code> resource, see <a href="/services/gamelift/builds/#permissions"><code>builds</code></a>
-
diff --git a/website/docs/services/gamelift/container_fleets/index.md b/website/docs/services/gamelift/container_fleets/index.md
index 3c4b0f99e..cf3f17fe4 100644
--- a/website/docs/services/gamelift/container_fleets/index.md
+++ b/website/docs/services/gamelift/container_fleets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>container_fleet</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "fleet_id",
@@ -420,6 +429,23 @@ Creates, updates, deletes or gets a <code>container_fleet</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "fleet_id",
+    "type": "string",
+    "description": "Unique fleet ID"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-containerfleet.html"><code>AWS::GameLift::ContainerFleet</code></a>.
 
@@ -429,31 +455,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>container_fleets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FleetRoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>container_fleets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>container_fleets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>container_fleets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>container_fleets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -462,6 +494,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>container_fleet</code>.
 ```sql
 SELECT
@@ -494,6 +535,19 @@ fleet_arn
 FROM awscc.gamelift.container_fleets
 WHERE region = 'us-east-1' AND data__Identifier = '<FleetId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>container_fleets</code> in a region.
+```sql
+SELECT
+region,
+fleet_id
+FROM awscc.gamelift.container_fleets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -656,6 +710,33 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.gamelift.container_fleets
+SET data__PatchDocument = string('{{ {
+    "FleetRoleArn": fleet_role_arn,
+    "Description": description,
+    "GameServerContainerGroupDefinitionName": game_server_container_group_definition_name,
+    "PerInstanceContainerGroupDefinitionName": per_instance_container_group_definition_name,
+    "InstanceConnectionPortRange": instance_connection_port_range,
+    "InstanceInboundPermissions": instance_inbound_permissions,
+    "GameServerContainerGroupsPerInstance": game_server_container_groups_per_instance,
+    "DeploymentConfiguration": deployment_configuration,
+    "Locations": locations,
+    "ScalingPolicies": scaling_policies,
+    "MetricGroups": metric_groups,
+    "NewGameSessionProtectionPolicy": new_game_session_protection_policy,
+    "GameSessionCreationLimitPolicy": game_session_creation_limit_policy,
+    "LogConfiguration": log_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FleetId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/gamelift/container_fleets_list_only/index.md b/website/docs/services/gamelift/container_fleets_list_only/index.md
deleted file mode 100644
index 94efb73b4..000000000
--- a/website/docs/services/gamelift/container_fleets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: container_fleets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - container_fleets_list_only
-  - gamelift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>container_fleets</code> in a region or regions, for all properties use <a href="/services/gamelift/container_fleets/"><code>container_fleets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>container_fleets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::GameLift::ContainerFleet resource creates an Amazon GameLift (GameLift) container fleet to host game servers.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.gamelift.container_fleets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "fleet_id",
-    "type": "string",
-    "description": "Unique fleet ID"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>container_fleets</code> in a region.
-```sql
-SELECT
-region,
-fleet_id
-FROM awscc.gamelift.container_fleets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>container_fleets_list_only</code> resource, see <a href="/services/gamelift/container_fleets/#permissions"><code>container_fleets</code></a>
-
diff --git a/website/docs/services/gamelift/container_group_definitions/index.md b/website/docs/services/gamelift/container_group_definitions/index.md
index c6c46f572..5944ea223 100644
--- a/website/docs/services/gamelift/container_group_definitions/index.md
+++ b/website/docs/services/gamelift/container_group_definitions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>container_group_definition</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "container_group_definition_arn",
@@ -383,6 +392,23 @@ Creates, updates, deletes or gets a <code>container_group_definition</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "A descriptive label for the container group definition."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-containergroupdefinition.html"><code>AWS::GameLift::ContainerGroupDefinition</code></a>.
 
@@ -392,31 +418,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>container_group_definitions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, OperatingSystem, TotalMemoryLimitMebibytes, TotalVcpuLimit, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>container_group_definitions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>container_group_definitions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>container_group_definitions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>container_group_definitions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -425,6 +457,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>container_group_definition</code>.
 ```sql
 SELECT
@@ -447,6 +488,19 @@ tags
 FROM awscc.gamelift.container_group_definitions
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>container_group_definitions</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.gamelift.container_group_definitions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -590,6 +644,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.gamelift.container_group_definitions
+SET data__PatchDocument = string('{{ {
+    "OperatingSystem": operating_system,
+    "TotalMemoryLimitMebibytes": total_memory_limit_mebibytes,
+    "TotalVcpuLimit": total_vcpu_limit,
+    "GameServerContainerDefinition": game_server_container_definition,
+    "SupportContainerDefinitions": support_container_definitions,
+    "SourceVersionNumber": source_version_number,
+    "VersionDescription": version_description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/gamelift/container_group_definitions_list_only/index.md b/website/docs/services/gamelift/container_group_definitions_list_only/index.md
deleted file mode 100644
index bf50cc427..000000000
--- a/website/docs/services/gamelift/container_group_definitions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: container_group_definitions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - container_group_definitions_list_only
-  - gamelift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>container_group_definitions</code> in a region or regions, for all properties use <a href="/services/gamelift/container_group_definitions/"><code>container_group_definitions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>container_group_definitions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::GameLift::ContainerGroupDefinition resource creates an Amazon GameLift container group definition.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.gamelift.container_group_definitions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "A descriptive label for the container group definition."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>container_group_definitions</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.gamelift.container_group_definitions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>container_group_definitions_list_only</code> resource, see <a href="/services/gamelift/container_group_definitions/#permissions"><code>container_group_definitions</code></a>
-
diff --git a/website/docs/services/gamelift/fleets/index.md b/website/docs/services/gamelift/fleets/index.md
index cccaa7ce1..edd933d67 100644
--- a/website/docs/services/gamelift/fleets/index.md
+++ b/website/docs/services/gamelift/fleets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>fleet</code> resource or lists <code>f
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "scaling_policies",
@@ -440,6 +449,23 @@ Creates, updates, deletes or gets a <code>fleet</code> resource or lists <code>f
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "fleet_id",
+    "type": "string",
+    "description": "Unique fleet ID"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html"><code>AWS::GameLift::Fleet</code></a>.
 
@@ -449,31 +475,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>fleets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -482,6 +514,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>fleet</code>.
 ```sql
 SELECT
@@ -519,6 +560,19 @@ fleet_arn
 FROM awscc.gamelift.fleets
 WHERE region = 'us-east-1' AND data__Identifier = '<FleetId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>fleets</code> in a region.
+```sql
+SELECT
+region,
+fleet_id
+FROM awscc.gamelift.fleets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -725,6 +779,33 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.gamelift.fleets
+SET data__PatchDocument = string('{{ {
+    "ScalingPolicies": scaling_policies,
+    "AnywhereConfiguration": anywhere_configuration,
+    "ApplyCapacity": apply_capacity,
+    "Description": description,
+    "DesiredEC2Instances": desired_ec2_instances,
+    "EC2InboundPermissions": e_c2_inbound_permissions,
+    "Locations": locations,
+    "MaxSize": max_size,
+    "MetricGroups": metric_groups,
+    "MinSize": min_size,
+    "Name": name,
+    "NewGameSessionProtectionPolicy": new_game_session_protection_policy,
+    "ResourceCreationLimitPolicy": resource_creation_limit_policy,
+    "RuntimeConfiguration": runtime_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FleetId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/gamelift/fleets_list_only/index.md b/website/docs/services/gamelift/fleets_list_only/index.md
deleted file mode 100644
index 2068ccb7e..000000000
--- a/website/docs/services/gamelift/fleets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: fleets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - fleets_list_only
-  - gamelift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>fleets</code> in a region or regions, for all properties use <a href="/services/gamelift/fleets/"><code>fleets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>fleets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::GameLift::Fleet resource creates an Amazon GameLift (GameLift) fleet to host game servers. A fleet is a set of EC2 or Anywhere instances, each of which can host multiple game sessions.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.gamelift.fleets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "fleet_id",
-    "type": "string",
-    "description": "Unique fleet ID"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>fleets</code> in a region.
-```sql
-SELECT
-region,
-fleet_id
-FROM awscc.gamelift.fleets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>fleets_list_only</code> resource, see <a href="/services/gamelift/fleets/#permissions"><code>fleets</code></a>
-
diff --git a/website/docs/services/gamelift/game_server_groups/index.md b/website/docs/services/gamelift/game_server_groups/index.md
index 68dcaa8a4..82f6e5aa1 100644
--- a/website/docs/services/gamelift/game_server_groups/index.md
+++ b/website/docs/services/gamelift/game_server_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>game_server_group</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "auto_scaling_group_arn",
@@ -170,6 +179,23 @@ Creates, updates, deletes or gets a <code>game_server_group</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "game_server_group_arn",
+    "type": "string",
+    "description": "A generated unique ID for the game server group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gameservergroup.html"><code>AWS::GameLift::GameServerGroup</code></a>.
 
@@ -179,31 +205,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>game_server_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GameServerGroupName, InstanceDefinitions, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>game_server_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>game_server_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>game_server_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>game_server_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -212,6 +244,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>game_server_group</code>.
 ```sql
 SELECT
@@ -233,6 +274,19 @@ vpc_subnets
 FROM awscc.gamelift.game_server_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<GameServerGroupArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>game_server_groups</code> in a region.
+```sql
+SELECT
+region,
+game_server_group_arn
+FROM awscc.gamelift.game_server_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -352,6 +406,30 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.gamelift.game_server_groups
+SET data__PatchDocument = string('{{ {
+    "AutoScalingPolicy": auto_scaling_policy,
+    "BalancingStrategy": balancing_strategy,
+    "DeleteOption": delete_option,
+    "GameServerGroupName": game_server_group_name,
+    "GameServerProtectionPolicy": game_server_protection_policy,
+    "InstanceDefinitions": instance_definitions,
+    "LaunchTemplate": launch_template,
+    "MaxSize": max_size,
+    "MinSize": min_size,
+    "RoleArn": role_arn,
+    "Tags": tags,
+    "VpcSubnets": vpc_subnets
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<GameServerGroupArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/gamelift/game_server_groups_list_only/index.md b/website/docs/services/gamelift/game_server_groups_list_only/index.md
deleted file mode 100644
index c44765ab8..000000000
--- a/website/docs/services/gamelift/game_server_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: game_server_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - game_server_groups_list_only
-  - gamelift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>game_server_groups</code> in a region or regions, for all properties use <a href="/services/gamelift/game_server_groups/"><code>game_server_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>game_server_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::GameLift::GameServerGroup resource creates an Amazon GameLift (GameLift) GameServerGroup.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.gamelift.game_server_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "game_server_group_arn",
-    "type": "string",
-    "description": "A generated unique ID for the game server group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>game_server_groups</code> in a region.
-```sql
-SELECT
-region,
-game_server_group_arn
-FROM awscc.gamelift.game_server_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>game_server_groups_list_only</code> resource, see <a href="/services/gamelift/game_server_groups/#permissions"><code>game_server_groups</code></a>
-
diff --git a/website/docs/services/gamelift/game_session_queues/index.md b/website/docs/services/gamelift/game_session_queues/index.md
index ef7a5b28d..1ff002843 100644
--- a/website/docs/services/gamelift/game_session_queues/index.md
+++ b/website/docs/services/gamelift/game_session_queues/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>game_session_queue</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -140,6 +149,23 @@ Creates, updates, deletes or gets a <code>game_session_queue</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "A descriptive label that is associated with game session queue. Queue names must be unique within each Region."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gamesessionqueue.html"><code>AWS::GameLift::GameSessionQueue</code></a>.
 
@@ -149,31 +175,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>game_session_queues</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>game_session_queues</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>game_session_queues</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>game_session_queues_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>game_session_queues</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -182,6 +214,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>game_session_queue</code>.
 ```sql
 SELECT
@@ -199,6 +240,19 @@ tags
 FROM awscc.gamelift.game_session_queues
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>game_session_queues</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.gamelift.game_session_queues_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -302,6 +356,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.gamelift.game_session_queues
+SET data__PatchDocument = string('{{ {
+    "TimeoutInSeconds": timeout_in_seconds,
+    "Destinations": destinations,
+    "PlayerLatencyPolicies": player_latency_policies,
+    "CustomEventData": custom_event_data,
+    "NotificationTarget": notification_target,
+    "FilterConfiguration": filter_configuration,
+    "PriorityConfiguration": priority_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/gamelift/game_session_queues_list_only/index.md b/website/docs/services/gamelift/game_session_queues_list_only/index.md
deleted file mode 100644
index df570b742..000000000
--- a/website/docs/services/gamelift/game_session_queues_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: game_session_queues_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - game_session_queues_list_only
-  - gamelift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>game_session_queues</code> in a region or regions, for all properties use <a href="/services/gamelift/game_session_queues/"><code>game_session_queues</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>game_session_queues_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::GameLift::GameSessionQueue resource creates an Amazon GameLift (GameLift) game session queue.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.gamelift.game_session_queues_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "A descriptive label that is associated with game session queue. Queue names must be unique within each Region."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>game_session_queues</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.gamelift.game_session_queues_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>game_session_queues_list_only</code> resource, see <a href="/services/gamelift/game_session_queues/#permissions"><code>game_session_queues</code></a>
-
diff --git a/website/docs/services/gamelift/index.md b/website/docs/services/gamelift/index.md
index f7f6f2411..cf322ac74 100644
--- a/website/docs/services/gamelift/index.md
+++ b/website/docs/services/gamelift/index.md
@@ -20,7 +20,7 @@ The gamelift service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>22</b></span><br />
+<span>total resources:&nbsp;<b>11</b></span><br />
 </div>
 </div>
 
@@ -30,28 +30,17 @@ The gamelift service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/gamelift/aliases/">aliases</a><br />
-<a href="/services/gamelift/aliases_list_only/">aliases_list_only</a><br />
 <a href="/services/gamelift/builds/">builds</a><br />
-<a href="/services/gamelift/builds_list_only/">builds_list_only</a><br />
 <a href="/services/gamelift/container_fleets/">container_fleets</a><br />
-<a href="/services/gamelift/container_fleets_list_only/">container_fleets_list_only</a><br />
 <a href="/services/gamelift/container_group_definitions/">container_group_definitions</a><br />
-<a href="/services/gamelift/container_group_definitions_list_only/">container_group_definitions_list_only</a><br />
 <a href="/services/gamelift/fleets/">fleets</a><br />
-<a href="/services/gamelift/fleets_list_only/">fleets_list_only</a><br />
 <a href="/services/gamelift/game_server_groups/">game_server_groups</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/gamelift/game_server_groups_list_only/">game_server_groups_list_only</a><br />
 <a href="/services/gamelift/game_session_queues/">game_session_queues</a><br />
-<a href="/services/gamelift/game_session_queues_list_only/">game_session_queues_list_only</a><br />
 <a href="/services/gamelift/locations/">locations</a><br />
-<a href="/services/gamelift/locations_list_only/">locations_list_only</a><br />
 <a href="/services/gamelift/matchmaking_configurations/">matchmaking_configurations</a><br />
-<a href="/services/gamelift/matchmaking_configurations_list_only/">matchmaking_configurations_list_only</a><br />
 <a href="/services/gamelift/matchmaking_rule_sets/">matchmaking_rule_sets</a><br />
-<a href="/services/gamelift/matchmaking_rule_sets_list_only/">matchmaking_rule_sets_list_only</a><br />
-<a href="/services/gamelift/scripts/">scripts</a><br />
-<a href="/services/gamelift/scripts_list_only/">scripts_list_only</a>
+<a href="/services/gamelift/scripts/">scripts</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/gamelift/locations/index.md b/website/docs/services/gamelift/locations/index.md
index ad78b293c..adc05f6ad 100644
--- a/website/docs/services/gamelift/locations/index.md
+++ b/website/docs/services/gamelift/locations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>location</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "location_name",
@@ -67,6 +76,23 @@ Creates, updates, deletes or gets a <code>location</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "location_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-location.html"><code>AWS::GameLift::Location</code></a>.
 
@@ -76,31 +102,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>locations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LocationName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>locations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>locations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>locations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>locations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -109,6 +141,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>location</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ tags
 FROM awscc.gamelift.locations
 WHERE region = 'us-east-1' AND data__Identifier = '<LocationName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>locations</code> in a region.
+```sql
+SELECT
+region,
+location_name
+FROM awscc.gamelift.locations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -185,6 +239,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.gamelift.locations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LocationName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/gamelift/locations_list_only/index.md b/website/docs/services/gamelift/locations_list_only/index.md
deleted file mode 100644
index 5cce2ed3e..000000000
--- a/website/docs/services/gamelift/locations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: locations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - locations_list_only
-  - gamelift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>locations</code> in a region or regions, for all properties use <a href="/services/gamelift/locations/"><code>locations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>locations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::GameLift::Location resource creates an Amazon GameLift (GameLift) custom location.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.gamelift.locations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "location_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>locations</code> in a region.
-```sql
-SELECT
-region,
-location_name
-FROM awscc.gamelift.locations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>locations_list_only</code> resource, see <a href="/services/gamelift/locations/#permissions"><code>locations</code></a>
-
diff --git a/website/docs/services/gamelift/matchmaking_configurations/index.md b/website/docs/services/gamelift/matchmaking_configurations/index.md
index 865484ef1..5ceabe506 100644
--- a/website/docs/services/gamelift/matchmaking_configurations/index.md
+++ b/website/docs/services/gamelift/matchmaking_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>matchmaking_configuration</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "acceptance_required",
@@ -154,6 +163,23 @@ Creates, updates, deletes or gets a <code>matchmaking_configuration</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "A unique identifier for the matchmaking configuration."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html"><code>AWS::GameLift::MatchmakingConfiguration</code></a>.
 
@@ -163,31 +189,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>matchmaking_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AcceptanceRequired, Name, RequestTimeoutSeconds, RuleSetName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>matchmaking_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>matchmaking_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>matchmaking_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>matchmaking_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -196,6 +228,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>matchmaking_configuration</code>.
 ```sql
 SELECT
@@ -221,6 +262,19 @@ tags
 FROM awscc.gamelift.matchmaking_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>matchmaking_configurations</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.gamelift.matchmaking_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -356,6 +410,34 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.gamelift.matchmaking_configurations
+SET data__PatchDocument = string('{{ {
+    "AcceptanceRequired": acceptance_required,
+    "AcceptanceTimeoutSeconds": acceptance_timeout_seconds,
+    "AdditionalPlayerCount": additional_player_count,
+    "BackfillMode": backfill_mode,
+    "CreationTime": creation_time,
+    "CustomEventData": custom_event_data,
+    "Description": description,
+    "FlexMatchMode": flex_match_mode,
+    "GameProperties": game_properties,
+    "GameSessionData": game_session_data,
+    "GameSessionQueueArns": game_session_queue_arns,
+    "NotificationTarget": notification_target,
+    "RequestTimeoutSeconds": request_timeout_seconds,
+    "RuleSetArn": rule_set_arn,
+    "RuleSetName": rule_set_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/gamelift/matchmaking_configurations_list_only/index.md b/website/docs/services/gamelift/matchmaking_configurations_list_only/index.md
deleted file mode 100644
index 9d01e2f1f..000000000
--- a/website/docs/services/gamelift/matchmaking_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: matchmaking_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - matchmaking_configurations_list_only
-  - gamelift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>matchmaking_configurations</code> in a region or regions, for all properties use <a href="/services/gamelift/matchmaking_configurations/"><code>matchmaking_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>matchmaking_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::GameLift::MatchmakingConfiguration resource creates an Amazon GameLift (GameLift) matchmaking configuration.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.gamelift.matchmaking_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "A unique identifier for the matchmaking configuration."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>matchmaking_configurations</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.gamelift.matchmaking_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>matchmaking_configurations_list_only</code> resource, see <a href="/services/gamelift/matchmaking_configurations/#permissions"><code>matchmaking_configurations</code></a>
-
diff --git a/website/docs/services/gamelift/matchmaking_rule_sets/index.md b/website/docs/services/gamelift/matchmaking_rule_sets/index.md
index 1e8a8a46c..111f4b7b2 100644
--- a/website/docs/services/gamelift/matchmaking_rule_sets/index.md
+++ b/website/docs/services/gamelift/matchmaking_rule_sets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>matchmaking_rule_set</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>matchmaking_rule_set</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "A unique identifier for the matchmaking rule set."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingruleset.html"><code>AWS::GameLift::MatchmakingRuleSet</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>matchmaking_rule_sets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, RuleSetBody, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>matchmaking_rule_sets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>matchmaking_rule_sets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>matchmaking_rule_sets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>matchmaking_rule_sets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>matchmaking_rule_set</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.gamelift.matchmaking_rule_sets
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>matchmaking_rule_sets</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.gamelift.matchmaking_rule_sets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -203,6 +257,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.gamelift.matchmaking_rule_sets
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/gamelift/matchmaking_rule_sets_list_only/index.md b/website/docs/services/gamelift/matchmaking_rule_sets_list_only/index.md
deleted file mode 100644
index 96be32ffd..000000000
--- a/website/docs/services/gamelift/matchmaking_rule_sets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: matchmaking_rule_sets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - matchmaking_rule_sets_list_only
-  - gamelift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>matchmaking_rule_sets</code> in a region or regions, for all properties use <a href="/services/gamelift/matchmaking_rule_sets/"><code>matchmaking_rule_sets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>matchmaking_rule_sets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::GameLift::MatchmakingRuleSet resource creates an Amazon GameLift (GameLift) matchmaking rule set.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.gamelift.matchmaking_rule_sets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "A unique identifier for the matchmaking rule set."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>matchmaking_rule_sets</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.gamelift.matchmaking_rule_sets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>matchmaking_rule_sets_list_only</code> resource, see <a href="/services/gamelift/matchmaking_rule_sets/#permissions"><code>matchmaking_rule_sets</code></a>
-
diff --git a/website/docs/services/gamelift/scripts/index.md b/website/docs/services/gamelift/scripts/index.md
index 8884244e1..32b3dae2b 100644
--- a/website/docs/services/gamelift/scripts/index.md
+++ b/website/docs/services/gamelift/scripts/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>script</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -114,6 +123,23 @@ Creates, updates, deletes or gets a <code>script</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "A unique identifier for the Realtime script"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-script.html"><code>AWS::GameLift::Script</code></a>.
 
@@ -123,31 +149,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>scripts</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="StorageLocation, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>scripts</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>scripts</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>scripts_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>scripts</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +188,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>script</code>.
 ```sql
 SELECT
@@ -171,6 +212,19 @@ size_on_disk
 FROM awscc.gamelift.scripts
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>scripts</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.gamelift.scripts_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -249,6 +303,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.gamelift.scripts
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "StorageLocation": storage_location,
+    "Version": version,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/gamelift/scripts_list_only/index.md b/website/docs/services/gamelift/scripts_list_only/index.md
deleted file mode 100644
index cae5bbe72..000000000
--- a/website/docs/services/gamelift/scripts_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: scripts_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - scripts_list_only
-  - gamelift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>scripts</code> in a region or regions, for all properties use <a href="/services/gamelift/scripts/"><code>scripts</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>scripts_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::GameLift::Script resource creates a new script record for your Realtime Servers script. Realtime scripts are JavaScript that provide configuration settings and optional custom game logic for your game. The script is deployed when you create a Realtime Servers fleet to host your game sessions. Script logic is executed during an active game session.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.gamelift.scripts_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "A unique identifier for the Realtime script"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>scripts</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.gamelift.scripts_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>scripts_list_only</code> resource, see <a href="/services/gamelift/scripts/#permissions"><code>scripts</code></a>
-
diff --git a/website/docs/services/globalaccelerator/accelerators/index.md b/website/docs/services/globalaccelerator/accelerators/index.md
index d74fb2c57..e0990961a 100644
--- a/website/docs/services/globalaccelerator/accelerators/index.md
+++ b/website/docs/services/globalaccelerator/accelerators/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>accelerator</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets an <code>accelerator</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "accelerator_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the accelerator."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-accelerator.html"><code>AWS::GlobalAccelerator::Accelerator</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>accelerators</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>accelerators</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>accelerators</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>accelerators_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>accelerators</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>accelerator</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ tags
 FROM awscc.globalaccelerator.accelerators
 WHERE data__Identifier = '<AcceleratorArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>accelerators</code> in a region.
+```sql
+SELECT
+region,
+accelerator_arn
+FROM awscc.globalaccelerator.accelerators_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -240,6 +294,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.globalaccelerator.accelerators
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "IpAddressType": ip_address_type,
+    "IpAddresses": ip_addresses,
+    "Enabled": enabled,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AcceleratorArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/globalaccelerator/accelerators_list_only/index.md b/website/docs/services/globalaccelerator/accelerators_list_only/index.md
deleted file mode 100644
index 491b3f276..000000000
--- a/website/docs/services/globalaccelerator/accelerators_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: accelerators_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - accelerators_list_only
-  - globalaccelerator
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>accelerators</code> in a region or regions, for all properties use <a href="/services/globalaccelerator/accelerators/"><code>accelerators</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>accelerators_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::GlobalAccelerator::Accelerator</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.globalaccelerator.accelerators_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "accelerator_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the accelerator."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>accelerators</code> in a region.
-```sql
-SELECT
-region,
-accelerator_arn
-FROM awscc.globalaccelerator.accelerators_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>accelerators_list_only</code> resource, see <a href="/services/globalaccelerator/accelerators/#permissions"><code>accelerators</code></a>
-
diff --git a/website/docs/services/globalaccelerator/cross_account_attachments/index.md b/website/docs/services/globalaccelerator/cross_account_attachments/index.md
index d81396c3b..2a555027e 100644
--- a/website/docs/services/globalaccelerator/cross_account_attachments/index.md
+++ b/website/docs/services/globalaccelerator/cross_account_attachments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cross_account_attachment</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets a <code>cross_account_attachment</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "attachment_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the attachment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-crossaccountattachment.html"><code>AWS::GlobalAccelerator::CrossAccountAttachment</code></a>.
 
@@ -103,31 +129,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cross_account_attachments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cross_account_attachments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cross_account_attachments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cross_account_attachments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cross_account_attachments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cross_account_attachment</code>.
 ```sql
 SELECT
@@ -148,6 +189,19 @@ tags
 FROM awscc.globalaccelerator.cross_account_attachments
 WHERE data__Identifier = '<AttachmentArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cross_account_attachments</code> in a region.
+```sql
+SELECT
+region,
+attachment_arn
+FROM awscc.globalaccelerator.cross_account_attachments_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -226,6 +280,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.globalaccelerator.cross_account_attachments
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Principals": principals,
+    "Resources": resources,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AttachmentArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/globalaccelerator/cross_account_attachments_list_only/index.md b/website/docs/services/globalaccelerator/cross_account_attachments_list_only/index.md
deleted file mode 100644
index c1879c8c7..000000000
--- a/website/docs/services/globalaccelerator/cross_account_attachments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: cross_account_attachments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cross_account_attachments_list_only
-  - globalaccelerator
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cross_account_attachments</code> in a region or regions, for all properties use <a href="/services/globalaccelerator/cross_account_attachments/"><code>cross_account_attachments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cross_account_attachments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::GlobalAccelerator::CrossAccountAttachment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.globalaccelerator.cross_account_attachments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "attachment_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the attachment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cross_account_attachments</code> in a region.
-```sql
-SELECT
-region,
-attachment_arn
-FROM awscc.globalaccelerator.cross_account_attachments_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cross_account_attachments_list_only</code> resource, see <a href="/services/globalaccelerator/cross_account_attachments/#permissions"><code>cross_account_attachments</code></a>
-
diff --git a/website/docs/services/globalaccelerator/endpoint_groups/index.md b/website/docs/services/globalaccelerator/endpoint_groups/index.md
index 26659cda0..8afe6f84e 100644
--- a/website/docs/services/globalaccelerator/endpoint_groups/index.md
+++ b/website/docs/services/globalaccelerator/endpoint_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>endpoint_group</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "listener_arn",
@@ -124,6 +133,23 @@ Creates, updates, deletes or gets an <code>endpoint_group</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "endpoint_group_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the endpoint group"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-endpointgroup.html"><code>AWS::GlobalAccelerator::EndpointGroup</code></a>.
 
@@ -133,31 +159,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>endpoint_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ListenerArn, EndpointGroupRegion, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>endpoint_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>endpoint_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>endpoint_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>endpoint_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -166,6 +198,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>endpoint_group</code>.
 ```sql
 SELECT
@@ -184,6 +225,19 @@ port_overrides
 FROM awscc.globalaccelerator.endpoint_groups
 WHERE data__Identifier = '<EndpointGroupArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>endpoint_groups</code> in a region.
+```sql
+SELECT
+region,
+endpoint_group_arn
+FROM awscc.globalaccelerator.endpoint_groups_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -288,6 +342,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.globalaccelerator.endpoint_groups
+SET data__PatchDocument = string('{{ {
+    "EndpointConfigurations": endpoint_configurations,
+    "TrafficDialPercentage": traffic_dial_percentage,
+    "HealthCheckPort": health_check_port,
+    "HealthCheckProtocol": health_check_protocol,
+    "HealthCheckPath": health_check_path,
+    "HealthCheckIntervalSeconds": health_check_interval_seconds,
+    "ThresholdCount": threshold_count,
+    "PortOverrides": port_overrides
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<EndpointGroupArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/globalaccelerator/endpoint_groups_list_only/index.md b/website/docs/services/globalaccelerator/endpoint_groups_list_only/index.md
deleted file mode 100644
index b44b40a16..000000000
--- a/website/docs/services/globalaccelerator/endpoint_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: endpoint_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - endpoint_groups_list_only
-  - globalaccelerator
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>endpoint_groups</code> in a region or regions, for all properties use <a href="/services/globalaccelerator/endpoint_groups/"><code>endpoint_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>endpoint_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::GlobalAccelerator::EndpointGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.globalaccelerator.endpoint_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "endpoint_group_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the endpoint group"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>endpoint_groups</code> in a region.
-```sql
-SELECT
-region,
-endpoint_group_arn
-FROM awscc.globalaccelerator.endpoint_groups_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>endpoint_groups_list_only</code> resource, see <a href="/services/globalaccelerator/endpoint_groups/#permissions"><code>endpoint_groups</code></a>
-
diff --git a/website/docs/services/globalaccelerator/index.md b/website/docs/services/globalaccelerator/index.md
index 7b188104e..d6900e764 100644
--- a/website/docs/services/globalaccelerator/index.md
+++ b/website/docs/services/globalaccelerator/index.md
@@ -20,7 +20,7 @@ The globalaccelerator service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The globalaccelerator service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/globalaccelerator/accelerators/">accelerators</a><br />
-<a href="/services/globalaccelerator/accelerators_list_only/">accelerators_list_only</a><br />
-<a href="/services/globalaccelerator/cross_account_attachments/">cross_account_attachments</a><br />
-<a href="/services/globalaccelerator/cross_account_attachments_list_only/">cross_account_attachments_list_only</a>
+<a href="/services/globalaccelerator/cross_account_attachments/">cross_account_attachments</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/globalaccelerator/endpoint_groups/">endpoint_groups</a><br />
-<a href="/services/globalaccelerator/endpoint_groups_list_only/">endpoint_groups_list_only</a><br />
-<a href="/services/globalaccelerator/listeners/">listeners</a><br />
-<a href="/services/globalaccelerator/listeners_list_only/">listeners_list_only</a>
+<a href="/services/globalaccelerator/listeners/">listeners</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/globalaccelerator/listeners/index.md b/website/docs/services/globalaccelerator/listeners/index.md
index a11ae1a91..a7073c9a5 100644
--- a/website/docs/services/globalaccelerator/listeners/index.md
+++ b/website/docs/services/globalaccelerator/listeners/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>listener</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "listener_arn",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>listener</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "listener_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the listener."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-listener.html"><code>AWS::GlobalAccelerator::Listener</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>listeners</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AcceleratorArn, PortRanges, Protocol, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>listeners</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>listeners</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>listeners_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>listeners</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>listener</code>.
 ```sql
 SELECT
@@ -126,6 +167,19 @@ client_affinity
 FROM awscc.globalaccelerator.listeners
 WHERE data__Identifier = '<ListenerArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>listeners</code> in a region.
+```sql
+SELECT
+region,
+listener_arn
+FROM awscc.globalaccelerator.listeners_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -204,6 +258,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.globalaccelerator.listeners
+SET data__PatchDocument = string('{{ {
+    "PortRanges": port_ranges,
+    "Protocol": protocol,
+    "ClientAffinity": client_affinity
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ListenerArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/globalaccelerator/listeners_list_only/index.md b/website/docs/services/globalaccelerator/listeners_list_only/index.md
deleted file mode 100644
index d42486461..000000000
--- a/website/docs/services/globalaccelerator/listeners_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: listeners_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - listeners_list_only
-  - globalaccelerator
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>listeners</code> in a region or regions, for all properties use <a href="/services/globalaccelerator/listeners/"><code>listeners</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>listeners_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::GlobalAccelerator::Listener</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.globalaccelerator.listeners_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "listener_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the listener."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>listeners</code> in a region.
-```sql
-SELECT
-region,
-listener_arn
-FROM awscc.globalaccelerator.listeners_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>listeners_list_only</code> resource, see <a href="/services/globalaccelerator/listeners/#permissions"><code>listeners</code></a>
-
diff --git a/website/docs/services/glue/crawlers/index.md b/website/docs/services/glue/crawlers/index.md
index 6fe1fba73..140691927 100644
--- a/website/docs/services/glue/crawlers/index.md
+++ b/website/docs/services/glue/crawlers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>crawler</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "classifiers",
@@ -366,6 +375,23 @@ Creates, updates, deletes or gets a <code>crawler</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the crawler."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html"><code>AWS::Glue::Crawler</code></a>.
 
@@ -375,31 +401,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>crawlers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Role, Targets, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>crawlers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>crawlers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>crawlers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>crawlers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -408,6 +440,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>crawler</code>.
 ```sql
 SELECT
@@ -429,6 +470,19 @@ tags
 FROM awscc.glue.crawlers
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>crawlers</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.glue.crawlers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -599,6 +653,31 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.glue.crawlers
+SET data__PatchDocument = string('{{ {
+    "Classifiers": classifiers,
+    "Description": description,
+    "SchemaChangePolicy": schema_change_policy,
+    "Configuration": configuration,
+    "RecrawlPolicy": recrawl_policy,
+    "DatabaseName": database_name,
+    "Targets": targets,
+    "CrawlerSecurityConfiguration": crawler_security_configuration,
+    "Role": role,
+    "LakeFormationConfiguration": lake_formation_configuration,
+    "Schedule": schedule,
+    "TablePrefix": table_prefix,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/glue/crawlers_list_only/index.md b/website/docs/services/glue/crawlers_list_only/index.md
deleted file mode 100644
index c5e940cea..000000000
--- a/website/docs/services/glue/crawlers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: crawlers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - crawlers_list_only
-  - glue
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>crawlers</code> in a region or regions, for all properties use <a href="/services/glue/crawlers/"><code>crawlers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>crawlers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Glue::Crawler</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.glue.crawlers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the crawler."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>crawlers</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.glue.crawlers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>crawlers_list_only</code> resource, see <a href="/services/glue/crawlers/#permissions"><code>crawlers</code></a>
-
diff --git a/website/docs/services/glue/databases/index.md b/website/docs/services/glue/databases/index.md
index 255a75e1f..e6cda726d 100644
--- a/website/docs/services/glue/databases/index.md
+++ b/website/docs/services/glue/databases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>database</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "catalog_id",
@@ -140,6 +149,23 @@ Creates, updates, deletes or gets a <code>database</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "database_name",
+    "type": "string",
+    "description": "The name of the database. For hive compatibility, this is folded to lowercase when it is store."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html"><code>AWS::Glue::Database</code></a>.
 
@@ -149,31 +175,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>databases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DatabaseInput, CatalogId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>databases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>databases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>databases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>databases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -182,6 +214,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>database</code>.
 ```sql
 SELECT
@@ -192,6 +233,19 @@ database_name
 FROM awscc.glue.databases
 WHERE region = 'us-east-1' AND data__Identifier = '<DatabaseName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>databases</code> in a region.
+```sql
+SELECT
+region,
+database_name
+FROM awscc.glue.databases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -278,6 +332,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.glue.databases
+SET data__PatchDocument = string('{{ {
+    "CatalogId": catalog_id,
+    "DatabaseInput": database_input
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DatabaseName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/glue/databases_list_only/index.md b/website/docs/services/glue/databases_list_only/index.md
deleted file mode 100644
index e71ecb250..000000000
--- a/website/docs/services/glue/databases_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: databases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - databases_list_only
-  - glue
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>databases</code> in a region or regions, for all properties use <a href="/services/glue/databases/"><code>databases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>databases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Glue::Database</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.glue.databases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "database_name",
-    "type": "string",
-    "description": "The name of the database. For hive compatibility, this is folded to lowercase when it is store."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>databases</code> in a region.
-```sql
-SELECT
-region,
-database_name
-FROM awscc.glue.databases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>databases_list_only</code> resource, see <a href="/services/glue/databases/#permissions"><code>databases</code></a>
-
diff --git a/website/docs/services/glue/index.md b/website/docs/services/glue/index.md
index eec568892..6413a4d25 100644
--- a/website/docs/services/glue/index.md
+++ b/website/docs/services/glue/index.md
@@ -20,7 +20,7 @@ The glue service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>14</b></span><br />
+<span>total resources:&nbsp;<b>7</b></span><br />
 </div>
 </div>
 
@@ -30,20 +30,13 @@ The glue service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/glue/crawlers/">crawlers</a><br />
-<a href="/services/glue/crawlers_list_only/">crawlers_list_only</a><br />
 <a href="/services/glue/databases/">databases</a><br />
-<a href="/services/glue/databases_list_only/">databases_list_only</a><br />
 <a href="/services/glue/jobs/">jobs</a><br />
-<a href="/services/glue/jobs_list_only/">jobs_list_only</a><br />
 <a href="/services/glue/schema_version_metadata/">schema_version_metadata</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/glue/schema_version_metadata_list_only/">schema_version_metadata_list_only</a><br />
 <a href="/services/glue/schema_versions/">schema_versions</a><br />
-<a href="/services/glue/schema_versions_list_only/">schema_versions_list_only</a><br />
 <a href="/services/glue/triggers/">triggers</a><br />
-<a href="/services/glue/triggers_list_only/">triggers_list_only</a><br />
-<a href="/services/glue/usage_profiles/">usage_profiles</a><br />
-<a href="/services/glue/usage_profiles_list_only/">usage_profiles_list_only</a>
+<a href="/services/glue/usage_profiles/">usage_profiles</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/glue/jobs/index.md b/website/docs/services/glue/jobs/index.md
index 41e94087b..c2f89e3c2 100644
--- a/website/docs/services/glue/jobs/index.md
+++ b/website/docs/services/glue/jobs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>job</code> resource or lists <code>job
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "connections",
@@ -198,6 +207,23 @@ Creates, updates, deletes or gets a <code>job</code> resource or lists <code>job
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name you assign to the job definition"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html"><code>AWS::Glue::Job</code></a>.
 
@@ -207,31 +233,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>jobs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Role, Command, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>jobs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>jobs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>jobs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>jobs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -240,6 +272,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>job</code>.
 ```sql
 SELECT
@@ -270,6 +311,19 @@ job_run_queuing_enabled
 FROM awscc.glue.jobs
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>jobs</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.glue.jobs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -428,6 +482,40 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.glue.jobs
+SET data__PatchDocument = string('{{ {
+    "Connections": connections,
+    "MaxRetries": max_retries,
+    "Description": description,
+    "Timeout": timeout,
+    "AllocatedCapacity": allocated_capacity,
+    "Role": role,
+    "DefaultArguments": default_arguments,
+    "NotificationProperty": notification_property,
+    "WorkerType": worker_type,
+    "ExecutionClass": execution_class,
+    "LogUri": log_uri,
+    "Command": command,
+    "GlueVersion": glue_version,
+    "ExecutionProperty": execution_property,
+    "SecurityConfiguration": security_configuration,
+    "NumberOfWorkers": number_of_workers,
+    "Tags": tags,
+    "MaxCapacity": max_capacity,
+    "NonOverridableArguments": non_overridable_arguments,
+    "MaintenanceWindow": maintenance_window,
+    "JobMode": job_mode,
+    "JobRunQueuingEnabled": job_run_queuing_enabled
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/glue/jobs_list_only/index.md b/website/docs/services/glue/jobs_list_only/index.md
deleted file mode 100644
index 6f84099fb..000000000
--- a/website/docs/services/glue/jobs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: jobs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - jobs_list_only
-  - glue
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>jobs</code> in a region or regions, for all properties use <a href="/services/glue/jobs/"><code>jobs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>jobs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Glue::Job</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.glue.jobs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name you assign to the job definition"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>jobs</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.glue.jobs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>jobs_list_only</code> resource, see <a href="/services/glue/jobs/#permissions"><code>jobs</code></a>
-
diff --git a/website/docs/services/glue/schema_version_metadata/index.md b/website/docs/services/glue/schema_version_metadata/index.md
index b3af969ec..5b98c8306 100644
--- a/website/docs/services/glue/schema_version_metadata/index.md
+++ b/website/docs/services/glue/schema_version_metadata/index.md
@@ -33,6 +33,40 @@ Creates, updates, deletes or gets a <code>schema_version_metadatum</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "schema_version_id",
+    "type": "string",
+    "description": "Represents the version ID associated with the schema version."
+  },
+  {
+    "name": "key",
+    "type": "string",
+    "description": "Metadata key"
+  },
+  {
+    "name": "value",
+    "type": "string",
+    "description": "Metadata value"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "schema_version_id",
@@ -55,6 +89,8 @@ Creates, updates, deletes or gets a <code>schema_version_metadatum</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schemaversionmetadatum.html"><code>AWS::Glue::SchemaVersionMetadata</code></a>.
 
@@ -64,26 +100,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>schema_version_metadata</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SchemaVersionId, Key, Value, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>schema_version_metadata</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>schema_version_metadata_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>schema_version_metadata</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +133,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>schema_version_metadatum</code>.
 ```sql
 SELECT
@@ -102,6 +152,21 @@ value
 FROM awscc.glue.schema_version_metadata
 WHERE region = 'us-east-1' AND data__Identifier = '<SchemaVersionId>|<Key>|<Value>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>schema_version_metadata</code> in a region.
+```sql
+SELECT
+region,
+schema_version_id,
+key,
+value
+FROM awscc.glue.schema_version_metadata_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -174,6 +239,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/glue/schema_version_metadata_list_only/index.md b/website/docs/services/glue/schema_version_metadata_list_only/index.md
deleted file mode 100644
index 52a4a86da..000000000
--- a/website/docs/services/glue/schema_version_metadata_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: schema_version_metadata_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - schema_version_metadata_list_only
-  - glue
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>schema_version_metadata</code> in a region or regions, for all properties use <a href="/services/glue/schema_version_metadata/"><code>schema_version_metadata</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>schema_version_metadata_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This resource adds Key-Value metadata to a Schema version of Glue Schema Registry.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.glue.schema_version_metadata_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "schema_version_id",
-    "type": "string",
-    "description": "Represents the version ID associated with the schema version."
-  },
-  {
-    "name": "key",
-    "type": "string",
-    "description": "Metadata key"
-  },
-  {
-    "name": "value",
-    "type": "string",
-    "description": "Metadata value"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>schema_version_metadata</code> in a region.
-```sql
-SELECT
-region,
-schema_version_id,
-key,
-value
-FROM awscc.glue.schema_version_metadata_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>schema_version_metadata_list_only</code> resource, see <a href="/services/glue/schema_version_metadata/#permissions"><code>schema_version_metadata</code></a>
-
diff --git a/website/docs/services/glue/schema_versions/index.md b/website/docs/services/glue/schema_versions/index.md
index 032ba2b45..3ffd697c8 100644
--- a/website/docs/services/glue/schema_versions/index.md
+++ b/website/docs/services/glue/schema_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>schema_version</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "schema",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>schema_version</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "version_id",
+    "type": "string",
+    "description": "Represents the version ID associated with the schema version."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schemaversion.html"><code>AWS::Glue::SchemaVersion</code></a>.
 
@@ -81,26 +107,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>schema_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Schema, SchemaDefinition, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>schema_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>schema_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>schema_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -109,6 +140,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>schema_version</code>.
 ```sql
 SELECT
@@ -119,6 +159,19 @@ version_id
 FROM awscc.glue.schema_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<VersionId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>schema_versions</code> in a region.
+```sql
+SELECT
+region,
+version_id
+FROM awscc.glue.schema_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -188,6 +241,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/glue/schema_versions_list_only/index.md b/website/docs/services/glue/schema_versions_list_only/index.md
deleted file mode 100644
index c79994b13..000000000
--- a/website/docs/services/glue/schema_versions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: schema_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - schema_versions_list_only
-  - glue
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>schema_versions</code> in a region or regions, for all properties use <a href="/services/glue/schema_versions/"><code>schema_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>schema_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This resource represents an individual schema version of a schema defined in Glue Schema Registry.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.glue.schema_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "version_id",
-    "type": "string",
-    "description": "Represents the version ID associated with the schema version."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>schema_versions</code> in a region.
-```sql
-SELECT
-region,
-version_id
-FROM awscc.glue.schema_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>schema_versions_list_only</code> resource, see <a href="/services/glue/schema_versions/#permissions"><code>schema_versions</code></a>
-
diff --git a/website/docs/services/glue/triggers/index.md b/website/docs/services/glue/triggers/index.md
index 335fd9a62..5fd5a952f 100644
--- a/website/docs/services/glue/triggers/index.md
+++ b/website/docs/services/glue/triggers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>trigger</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "type",
@@ -180,6 +189,23 @@ Creates, updates, deletes or gets a <code>trigger</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the trigger."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html"><code>AWS::Glue::Trigger</code></a>.
 
@@ -189,31 +215,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>triggers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, Actions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>triggers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>triggers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>triggers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>triggers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -222,6 +254,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>trigger</code>.
 ```sql
 SELECT
@@ -239,6 +280,19 @@ predicate
 FROM awscc.glue.triggers
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>triggers</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.glue.triggers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -353,6 +407,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.glue.triggers
+SET data__PatchDocument = string('{{ {
+    "StartOnCreation": start_on_creation,
+    "Description": description,
+    "Actions": actions,
+    "EventBatchingCondition": event_batching_condition,
+    "Schedule": schedule,
+    "Tags": tags,
+    "Predicate": predicate
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/glue/triggers_list_only/index.md b/website/docs/services/glue/triggers_list_only/index.md
deleted file mode 100644
index ca68341a6..000000000
--- a/website/docs/services/glue/triggers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: triggers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - triggers_list_only
-  - glue
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>triggers</code> in a region or regions, for all properties use <a href="/services/glue/triggers/"><code>triggers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>triggers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Glue::Trigger</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.glue.triggers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the trigger."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>triggers</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.glue.triggers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>triggers_list_only</code> resource, see <a href="/services/glue/triggers/#permissions"><code>triggers</code></a>
-
diff --git a/website/docs/services/glue/usage_profiles/index.md b/website/docs/services/glue/usage_profiles/index.md
index 22f43428b..faff4e705 100644
--- a/website/docs/services/glue/usage_profiles/index.md
+++ b/website/docs/services/glue/usage_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>usage_profile</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -89,6 +98,23 @@ Creates, updates, deletes or gets an <code>usage_profile</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the UsageProfile."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-usageprofile.html"><code>AWS::Glue::UsageProfile</code></a>.
 
@@ -98,31 +124,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>usage_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>usage_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>usage_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>usage_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>usage_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -131,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>usage_profile</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ created_on
 FROM awscc.glue.usage_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>usage_profiles</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.glue.usage_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +271,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.glue.usage_profiles
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Configuration": configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/glue/usage_profiles_list_only/index.md b/website/docs/services/glue/usage_profiles_list_only/index.md
deleted file mode 100644
index 3b1aa4f8a..000000000
--- a/website/docs/services/glue/usage_profiles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: usage_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - usage_profiles_list_only
-  - glue
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>usage_profiles</code> in a region or regions, for all properties use <a href="/services/glue/usage_profiles/"><code>usage_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>usage_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This creates a Resource of UsageProfile type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.glue.usage_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the UsageProfile."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>usage_profiles</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.glue.usage_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>usage_profiles_list_only</code> resource, see <a href="/services/glue/usage_profiles/#permissions"><code>usage_profiles</code></a>
-
diff --git a/website/docs/services/grafana/index.md b/website/docs/services/grafana/index.md
index 87bbcdb82..9c4e8ba68 100644
--- a/website/docs/services/grafana/index.md
+++ b/website/docs/services/grafana/index.md
@@ -20,7 +20,7 @@ The grafana service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The grafana service documentation.
 <a href="/services/grafana/workspaces/">workspaces</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/grafana/workspaces_list_only/">workspaces_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/grafana/workspaces/index.md b/website/docs/services/grafana/workspaces/index.md
index 766c8d63a..512d70012 100644
--- a/website/docs/services/grafana/workspaces/index.md
+++ b/website/docs/services/grafana/workspaces/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>workspace</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "authentication_providers",
@@ -267,6 +276,23 @@ Creates, updates, deletes or gets a <code>workspace</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The id that uniquely identifies a Grafana workspace."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-grafana-workspace.html"><code>AWS::Grafana::Workspace</code></a>.
 
@@ -276,31 +302,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>workspaces</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AuthenticationProviders, PermissionType, AccountAccessType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>workspaces</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>workspaces</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>workspaces_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>workspaces</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -309,6 +341,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>workspace</code>.
 ```sql
 SELECT
@@ -340,6 +381,19 @@ plugin_admin_enabled
 FROM awscc.grafana.workspaces
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>workspaces</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.grafana.workspaces_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -498,6 +552,34 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.grafana.workspaces
+SET data__PatchDocument = string('{{ {
+    "AuthenticationProviders": authentication_providers,
+    "SamlConfiguration": saml_configuration,
+    "NetworkAccessControl": network_access_control,
+    "VpcConfiguration": vpc_configuration,
+    "GrafanaVersion": grafana_version,
+    "AccountAccessType": account_access_type,
+    "OrganizationRoleName": organization_role_name,
+    "PermissionType": permission_type,
+    "StackSetName": stack_set_name,
+    "DataSources": data_sources,
+    "Description": description,
+    "Name": name,
+    "NotificationDestinations": notification_destinations,
+    "OrganizationalUnits": organizational_units,
+    "RoleArn": role_arn,
+    "PluginAdminEnabled": plugin_admin_enabled
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/grafana/workspaces_list_only/index.md b/website/docs/services/grafana/workspaces_list_only/index.md
deleted file mode 100644
index 85fcf6f80..000000000
--- a/website/docs/services/grafana/workspaces_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: workspaces_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - workspaces_list_only
-  - grafana
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>workspaces</code> in a region or regions, for all properties use <a href="/services/grafana/workspaces/"><code>workspaces</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>workspaces_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Grafana::Workspace Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.grafana.workspaces_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The id that uniquely identifies a Grafana workspace."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>workspaces</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.grafana.workspaces_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>workspaces_list_only</code> resource, see <a href="/services/grafana/workspaces/#permissions"><code>workspaces</code></a>
-
diff --git a/website/docs/services/greengrassv2/component_versions/index.md b/website/docs/services/greengrassv2/component_versions/index.md
index f6e7587c9..d7eb3977f 100644
--- a/website/docs/services/greengrassv2/component_versions/index.md
+++ b/website/docs/services/greengrassv2/component_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>component_version</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -195,6 +204,23 @@ Creates, updates, deletes or gets a <code>component_version</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrassv2-componentversion.html"><code>AWS::GreengrassV2::ComponentVersion</code></a>.
 
@@ -204,31 +230,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>component_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>component_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>component_versions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>component_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>component_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -237,6 +269,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>component_version</code>.
 ```sql
 SELECT
@@ -250,6 +291,19 @@ tags
 FROM awscc.greengrassv2.component_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>component_versions</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.greengrassv2.component_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -357,6 +411,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.greengrassv2.component_versions
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/greengrassv2/component_versions_list_only/index.md b/website/docs/services/greengrassv2/component_versions_list_only/index.md
deleted file mode 100644
index 34c2eb6bd..000000000
--- a/website/docs/services/greengrassv2/component_versions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: component_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - component_versions_list_only
-  - greengrassv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>component_versions</code> in a region or regions, for all properties use <a href="/services/greengrassv2/component_versions/"><code>component_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>component_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource for Greengrass component version.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.greengrassv2.component_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>component_versions</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.greengrassv2.component_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>component_versions_list_only</code> resource, see <a href="/services/greengrassv2/component_versions/#permissions"><code>component_versions</code></a>
-
diff --git a/website/docs/services/greengrassv2/deployments/index.md b/website/docs/services/greengrassv2/deployments/index.md
index f89de5cc3..d1d894410 100644
--- a/website/docs/services/greengrassv2/deployments/index.md
+++ b/website/docs/services/greengrassv2/deployments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "target_arn",
@@ -198,6 +207,23 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "deployment_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrassv2-deployment.html"><code>AWS::GreengrassV2::Deployment</code></a>.
 
@@ -207,31 +233,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TargetArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>deployments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -240,6 +272,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>deployment</code>.
 ```sql
 SELECT
@@ -255,6 +296,19 @@ tags
 FROM awscc.greengrassv2.deployments
 WHERE region = 'us-east-1' AND data__Identifier = '<DeploymentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>deployments</code> in a region.
+```sql
+SELECT
+region,
+deployment_id
+FROM awscc.greengrassv2.deployments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -359,6 +413,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.greengrassv2.deployments
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DeploymentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/greengrassv2/deployments_list_only/index.md b/website/docs/services/greengrassv2/deployments_list_only/index.md
deleted file mode 100644
index 12f328c94..000000000
--- a/website/docs/services/greengrassv2/deployments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: deployments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - deployments_list_only
-  - greengrassv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>deployments</code> in a region or regions, for all properties use <a href="/services/greengrassv2/deployments/"><code>deployments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>deployments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource for Greengrass V2 deployment.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.greengrassv2.deployments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "deployment_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>deployments</code> in a region.
-```sql
-SELECT
-region,
-deployment_id
-FROM awscc.greengrassv2.deployments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>deployments_list_only</code> resource, see <a href="/services/greengrassv2/deployments/#permissions"><code>deployments</code></a>
-
diff --git a/website/docs/services/greengrassv2/index.md b/website/docs/services/greengrassv2/index.md
index a92234f6c..a8192c3b3 100644
--- a/website/docs/services/greengrassv2/index.md
+++ b/website/docs/services/greengrassv2/index.md
@@ -20,7 +20,7 @@ The greengrassv2 service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The greengrassv2 service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/greengrassv2/component_versions/">component_versions</a><br />
-<a href="/services/greengrassv2/component_versions_list_only/">component_versions_list_only</a>
+<a href="/services/greengrassv2/component_versions/">component_versions</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/greengrassv2/deployments/">deployments</a><br />
-<a href="/services/greengrassv2/deployments_list_only/">deployments_list_only</a>
+<a href="/services/greengrassv2/deployments/">deployments</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/groundstation/configs/index.md b/website/docs/services/groundstation/configs/index.md
index 0798a73d2..9eff0e60c 100644
--- a/website/docs/services/groundstation/configs/index.md
+++ b/website/docs/services/groundstation/configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>config</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -280,6 +289,23 @@ Creates, updates, deletes or gets a <code>config</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-config.html"><code>AWS::GroundStation::Config</code></a>.
 
@@ -289,31 +315,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, ConfigData, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>configs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -322,6 +354,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>config</code>.
 ```sql
 SELECT
@@ -335,6 +376,19 @@ id
 FROM awscc.groundstation.configs
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>configs</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.groundstation.configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -442,6 +496,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.groundstation.configs
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Tags": tags,
+    "ConfigData": config_data
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/groundstation/configs_list_only/index.md b/website/docs/services/groundstation/configs_list_only/index.md
deleted file mode 100644
index ec68929df..000000000
--- a/website/docs/services/groundstation/configs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - configs_list_only
-  - groundstation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>configs</code> in a region or regions, for all properties use <a href="/services/groundstation/configs/"><code>configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS Ground Station config resource type for CloudFormation.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.groundstation.configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>configs</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.groundstation.configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>configs_list_only</code> resource, see <a href="/services/groundstation/configs/#permissions"><code>configs</code></a>
-
diff --git a/website/docs/services/groundstation/dataflow_endpoint_groups/index.md b/website/docs/services/groundstation/dataflow_endpoint_groups/index.md
index b7381cc2f..f34a60772 100644
--- a/website/docs/services/groundstation/dataflow_endpoint_groups/index.md
+++ b/website/docs/services/groundstation/dataflow_endpoint_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>dataflow_endpoint_group</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -196,6 +205,23 @@ Creates, updates, deletes or gets a <code>dataflow_endpoint_group</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-dataflowendpointgroup.html"><code>AWS::GroundStation::DataflowEndpointGroup</code></a>.
 
@@ -205,31 +231,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>dataflow_endpoint_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EndpointDetails, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>dataflow_endpoint_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>dataflow_endpoint_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>dataflow_endpoint_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>dataflow_endpoint_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -238,6 +270,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dataflow_endpoint_group</code>.
 ```sql
 SELECT
@@ -251,6 +292,19 @@ tags
 FROM awscc.groundstation.dataflow_endpoint_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>dataflow_endpoint_groups</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.groundstation.dataflow_endpoint_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -351,6 +405,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.groundstation.dataflow_endpoint_groups
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/groundstation/dataflow_endpoint_groups_list_only/index.md b/website/docs/services/groundstation/dataflow_endpoint_groups_list_only/index.md
deleted file mode 100644
index c8ea8ddae..000000000
--- a/website/docs/services/groundstation/dataflow_endpoint_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: dataflow_endpoint_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - dataflow_endpoint_groups_list_only
-  - groundstation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>dataflow_endpoint_groups</code> in a region or regions, for all properties use <a href="/services/groundstation/dataflow_endpoint_groups/"><code>dataflow_endpoint_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>dataflow_endpoint_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS Ground Station DataflowEndpointGroup schema for CloudFormation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.groundstation.dataflow_endpoint_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>dataflow_endpoint_groups</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.groundstation.dataflow_endpoint_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>dataflow_endpoint_groups_list_only</code> resource, see <a href="/services/groundstation/dataflow_endpoint_groups/#permissions"><code>dataflow_endpoint_groups</code></a>
-
diff --git a/website/docs/services/groundstation/index.md b/website/docs/services/groundstation/index.md
index 42d6af4ab..3127c7f05 100644
--- a/website/docs/services/groundstation/index.md
+++ b/website/docs/services/groundstation/index.md
@@ -20,7 +20,7 @@ The groundstation service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The groundstation service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/groundstation/configs/">configs</a><br />
-<a href="/services/groundstation/configs_list_only/">configs_list_only</a><br />
 <a href="/services/groundstation/dataflow_endpoint_groups/">dataflow_endpoint_groups</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/groundstation/dataflow_endpoint_groups_list_only/">dataflow_endpoint_groups_list_only</a><br />
-<a href="/services/groundstation/mission_profiles/">mission_profiles</a><br />
-<a href="/services/groundstation/mission_profiles_list_only/">mission_profiles_list_only</a>
+<a href="/services/groundstation/mission_profiles/">mission_profiles</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/groundstation/mission_profiles/index.md b/website/docs/services/groundstation/mission_profiles/index.md
index 49eb2fcfd..d8c3efcbf 100644
--- a/website/docs/services/groundstation/mission_profiles/index.md
+++ b/website/docs/services/groundstation/mission_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>mission_profile</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -141,6 +150,33 @@ Creates, updates, deletes or gets a <code>mission_profile</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-missionprofile.html"><code>AWS::GroundStation::MissionProfile</code></a>.
 
@@ -150,31 +186,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>mission_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, MinimumViableContactDurationSeconds, DataflowEdges, TrackingConfigArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>mission_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>mission_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>mission_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>mission_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -183,6 +225,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>mission_profile</code>.
 ```sql
 SELECT
@@ -202,6 +253,20 @@ region
 FROM awscc.groundstation.mission_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>|<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>mission_profiles</code> in a region.
+```sql
+SELECT
+region,
+id,
+arn
+FROM awscc.groundstation.mission_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -307,6 +372,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.groundstation.mission_profiles
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "ContactPrePassDurationSeconds": contact_pre_pass_duration_seconds,
+    "ContactPostPassDurationSeconds": contact_post_pass_duration_seconds,
+    "MinimumViableContactDurationSeconds": minimum_viable_contact_duration_seconds,
+    "StreamsKmsKey": streams_kms_key,
+    "StreamsKmsRole": streams_kms_role,
+    "DataflowEdges": dataflow_edges,
+    "TrackingConfigArn": tracking_config_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>|<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/groundstation/mission_profiles_list_only/index.md b/website/docs/services/groundstation/mission_profiles_list_only/index.md
deleted file mode 100644
index 1aa0d8e0c..000000000
--- a/website/docs/services/groundstation/mission_profiles_list_only/index.md
+++ /dev/null
@@ -1,91 +0,0 @@
----
-title: mission_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - mission_profiles_list_only
-  - groundstation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>mission_profiles</code> in a region or regions, for all properties use <a href="/services/groundstation/mission_profiles/"><code>mission_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>mission_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS Ground Station Mission Profile resource type for CloudFormation.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.groundstation.mission_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>mission_profiles</code> in a region.
-```sql
-SELECT
-region,
-id,
-arn
-FROM awscc.groundstation.mission_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>mission_profiles_list_only</code> resource, see <a href="/services/groundstation/mission_profiles/#permissions"><code>mission_profiles</code></a>
-
diff --git a/website/docs/services/guardduty/detectors/index.md b/website/docs/services/guardduty/detectors/index.md
index 8b897d2d4..6d5aeccf7 100644
--- a/website/docs/services/guardduty/detectors/index.md
+++ b/website/docs/services/guardduty/detectors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>detector</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "finding_publishing_frequency",
@@ -163,6 +172,23 @@ Creates, updates, deletes or gets a <code>detector</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html"><code>AWS::GuardDuty::Detector</code></a>.
 
@@ -172,31 +198,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>detectors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Enable, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>detectors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>detectors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>detectors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>detectors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -205,6 +237,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>detector</code>.
 ```sql
 SELECT
@@ -218,6 +259,19 @@ tags
 FROM awscc.guardduty.detectors
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>detectors</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.guardduty.detectors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -309,6 +363,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.guardduty.detectors
+SET data__PatchDocument = string('{{ {
+    "FindingPublishingFrequency": finding_publishing_frequency,
+    "Enable": enable,
+    "DataSources": data_sources,
+    "Features": features,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/guardduty/detectors_list_only/index.md b/website/docs/services/guardduty/detectors_list_only/index.md
deleted file mode 100644
index fa377a00f..000000000
--- a/website/docs/services/guardduty/detectors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: detectors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - detectors_list_only
-  - guardduty
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>detectors</code> in a region or regions, for all properties use <a href="/services/guardduty/detectors/"><code>detectors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>detectors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::GuardDuty::Detector</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.guardduty.detectors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>detectors</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.guardduty.detectors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>detectors_list_only</code> resource, see <a href="/services/guardduty/detectors/#permissions"><code>detectors</code></a>
-
diff --git a/website/docs/services/guardduty/filters/index.md b/website/docs/services/guardduty/filters/index.md
index 0b0fcd748..25b1a0e23 100644
--- a/website/docs/services/guardduty/filters/index.md
+++ b/website/docs/services/guardduty/filters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>filter</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "action",
@@ -94,6 +103,28 @@ Creates, updates, deletes or gets a <code>filter</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "detector_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html"><code>AWS::GuardDuty::Filter</code></a>.
 
@@ -103,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>filters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DetectorId, Name, FindingCriteria, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>filters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>filters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>filters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>filters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>filter</code>.
 ```sql
 SELECT
@@ -150,6 +196,20 @@ tags
 FROM awscc.guardduty.filters
 WHERE region = 'us-east-1' AND data__Identifier = '<DetectorId>|<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>filters</code> in a region.
+```sql
+SELECT
+region,
+detector_id,
+name
+FROM awscc.guardduty.filters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -241,6 +301,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.guardduty.filters
+SET data__PatchDocument = string('{{ {
+    "Action": action,
+    "Description": description,
+    "FindingCriteria": finding_criteria,
+    "Rank": rank,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DetectorId>|<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/guardduty/filters_list_only/index.md b/website/docs/services/guardduty/filters_list_only/index.md
deleted file mode 100644
index fb7553720..000000000
--- a/website/docs/services/guardduty/filters_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: filters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - filters_list_only
-  - guardduty
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>filters</code> in a region or regions, for all properties use <a href="/services/guardduty/filters/"><code>filters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>filters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::GuardDuty::Filter</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.guardduty.filters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "detector_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>filters</code> in a region.
-```sql
-SELECT
-region,
-detector_id,
-name
-FROM awscc.guardduty.filters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>filters_list_only</code> resource, see <a href="/services/guardduty/filters/#permissions"><code>filters</code></a>
-
diff --git a/website/docs/services/guardduty/index.md b/website/docs/services/guardduty/index.md
index 8f46ba374..4468f5360 100644
--- a/website/docs/services/guardduty/index.md
+++ b/website/docs/services/guardduty/index.md
@@ -20,7 +20,7 @@ The guardduty service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>20</b></span><br />
+<span>total resources:&nbsp;<b>10</b></span><br />
 </div>
 </div>
 
@@ -30,26 +30,16 @@ The guardduty service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/guardduty/detectors/">detectors</a><br />
-<a href="/services/guardduty/detectors_list_only/">detectors_list_only</a><br />
 <a href="/services/guardduty/filters/">filters</a><br />
-<a href="/services/guardduty/filters_list_only/">filters_list_only</a><br />
 <a href="/services/guardduty/ip_sets/">ip_sets</a><br />
-<a href="/services/guardduty/ip_sets_list_only/">ip_sets_list_only</a><br />
 <a href="/services/guardduty/malware_protection_plans/">malware_protection_plans</a><br />
-<a href="/services/guardduty/malware_protection_plans_list_only/">malware_protection_plans_list_only</a><br />
-<a href="/services/guardduty/masters/">masters</a><br />
-<a href="/services/guardduty/masters_list_only/">masters_list_only</a>
+<a href="/services/guardduty/masters/">masters</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/guardduty/members/">members</a><br />
-<a href="/services/guardduty/members_list_only/">members_list_only</a><br />
 <a href="/services/guardduty/publishing_destinations/">publishing_destinations</a><br />
-<a href="/services/guardduty/publishing_destinations_list_only/">publishing_destinations_list_only</a><br />
 <a href="/services/guardduty/threat_entity_sets/">threat_entity_sets</a><br />
-<a href="/services/guardduty/threat_entity_sets_list_only/">threat_entity_sets_list_only</a><br />
 <a href="/services/guardduty/threat_intel_sets/">threat_intel_sets</a><br />
-<a href="/services/guardduty/threat_intel_sets_list_only/">threat_intel_sets_list_only</a><br />
-<a href="/services/guardduty/trusted_entity_sets/">trusted_entity_sets</a><br />
-<a href="/services/guardduty/trusted_entity_sets_list_only/">trusted_entity_sets_list_only</a>
+<a href="/services/guardduty/trusted_entity_sets/">trusted_entity_sets</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/guardduty/ip_sets/index.md b/website/docs/services/guardduty/ip_sets/index.md
index 52cfabcde..bffdb440f 100644
--- a/website/docs/services/guardduty/ip_sets/index.md
+++ b/website/docs/services/guardduty/ip_sets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ip_set</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -92,6 +101,28 @@ Creates, updates, deletes or gets an <code>ip_set</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "detector_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html"><code>AWS::GuardDuty::IPSet</code></a>.
 
@@ -101,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ip_sets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Format, Location, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ip_sets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ip_sets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ip_sets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ip_sets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ip_set</code>.
 ```sql
 SELECT
@@ -149,6 +195,20 @@ tags
 FROM awscc.guardduty.ip_sets
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>|<DetectorId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ip_sets</code> in a region.
+```sql
+SELECT
+region,
+id,
+detector_id
+FROM awscc.guardduty.ip_sets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -237,6 +297,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.guardduty.ip_sets
+SET data__PatchDocument = string('{{ {
+    "Activate": activate,
+    "Name": name,
+    "Location": location,
+    "ExpectedBucketOwner": expected_bucket_owner,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>|<DetectorId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/guardduty/ip_sets_list_only/index.md b/website/docs/services/guardduty/ip_sets_list_only/index.md
deleted file mode 100644
index 1f09809af..000000000
--- a/website/docs/services/guardduty/ip_sets_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: ip_sets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ip_sets_list_only
-  - guardduty
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ip_sets</code> in a region or regions, for all properties use <a href="/services/guardduty/ip_sets/"><code>ip_sets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ip_sets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::GuardDuty::IPSet</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.guardduty.ip_sets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "detector_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ip_sets</code> in a region.
-```sql
-SELECT
-region,
-id,
-detector_id
-FROM awscc.guardduty.ip_sets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ip_sets_list_only</code> resource, see <a href="/services/guardduty/ip_sets/#permissions"><code>ip_sets</code></a>
-
diff --git a/website/docs/services/guardduty/malware_protection_plans/index.md b/website/docs/services/guardduty/malware_protection_plans/index.md
index 7b48b5109..7862b6317 100644
--- a/website/docs/services/guardduty/malware_protection_plans/index.md
+++ b/website/docs/services/guardduty/malware_protection_plans/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>malware_protection_plan</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "malware_protection_plan_id",
@@ -142,6 +151,23 @@ Creates, updates, deletes or gets a <code>malware_protection_plan</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "malware_protection_plan_id",
+    "type": "string",
+    "description": "A unique identifier associated with Malware Protection plan resource."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-malwareprotectionplan.html"><code>AWS::GuardDuty::MalwareProtectionPlan</code></a>.
 
@@ -151,31 +177,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>malware_protection_plans</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Role, ProtectedResource, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>malware_protection_plans</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>malware_protection_plans</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>malware_protection_plans_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>malware_protection_plans</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -184,6 +216,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>malware_protection_plan</code>.
 ```sql
 SELECT
@@ -200,6 +241,19 @@ tags
 FROM awscc.guardduty.malware_protection_plans
 WHERE region = 'us-east-1' AND data__Identifier = '<MalwareProtectionPlanId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>malware_protection_plans</code> in a region.
+```sql
+SELECT
+region,
+malware_protection_plan_id
+FROM awscc.guardduty.malware_protection_plans_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -282,6 +336,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.guardduty.malware_protection_plans
+SET data__PatchDocument = string('{{ {
+    "Role": role,
+    "ProtectedResource": protected_resource,
+    "Actions": actions,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<MalwareProtectionPlanId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/guardduty/malware_protection_plans_list_only/index.md b/website/docs/services/guardduty/malware_protection_plans_list_only/index.md
deleted file mode 100644
index d29513b0d..000000000
--- a/website/docs/services/guardduty/malware_protection_plans_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: malware_protection_plans_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - malware_protection_plans_list_only
-  - guardduty
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>malware_protection_plans</code> in a region or regions, for all properties use <a href="/services/guardduty/malware_protection_plans/"><code>malware_protection_plans</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>malware_protection_plans_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::GuardDuty::MalwareProtectionPlan</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.guardduty.malware_protection_plans_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "malware_protection_plan_id",
-    "type": "string",
-    "description": "A unique identifier associated with Malware Protection plan resource."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>malware_protection_plans</code> in a region.
-```sql
-SELECT
-region,
-malware_protection_plan_id
-FROM awscc.guardduty.malware_protection_plans_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>malware_protection_plans_list_only</code> resource, see <a href="/services/guardduty/malware_protection_plans/#permissions"><code>malware_protection_plans</code></a>
-
diff --git a/website/docs/services/guardduty/masters/index.md b/website/docs/services/guardduty/masters/index.md
index 32240915e..e440d9aba 100644
--- a/website/docs/services/guardduty/masters/index.md
+++ b/website/docs/services/guardduty/masters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>master</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "master_id",
@@ -55,6 +64,28 @@ Creates, updates, deletes or gets a <code>master</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "master_id",
+    "type": "string",
+    "description": "ID of the account used as the master account."
+  },
+  {
+    "name": "detector_id",
+    "type": "string",
+    "description": "Unique ID of the detector of the GuardDuty member account."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html"><code>AWS::GuardDuty::Master</code></a>.
 
@@ -64,26 +95,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>masters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="MasterId, DetectorId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>masters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>masters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>masters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +128,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>master</code>.
 ```sql
 SELECT
@@ -102,6 +147,20 @@ detector_id
 FROM awscc.guardduty.masters
 WHERE region = 'us-east-1' AND data__Identifier = '<DetectorId>|<MasterId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>masters</code> in a region.
+```sql
+SELECT
+region,
+detector_id,
+master_id
+FROM awscc.guardduty.masters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -172,6 +231,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/guardduty/masters_list_only/index.md b/website/docs/services/guardduty/masters_list_only/index.md
deleted file mode 100644
index ff6e56b9d..000000000
--- a/website/docs/services/guardduty/masters_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: masters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - masters_list_only
-  - guardduty
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>masters</code> in a region or regions, for all properties use <a href="/services/guardduty/masters/"><code>masters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>masters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>GuardDuty Master resource schema</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.guardduty.masters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "master_id",
-    "type": "string",
-    "description": "ID of the account used as the master account."
-  },
-  {
-    "name": "detector_id",
-    "type": "string",
-    "description": "Unique ID of the detector of the GuardDuty member account."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>masters</code> in a region.
-```sql
-SELECT
-region,
-detector_id,
-master_id
-FROM awscc.guardduty.masters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>masters_list_only</code> resource, see <a href="/services/guardduty/masters/#permissions"><code>masters</code></a>
-
diff --git a/website/docs/services/guardduty/members/index.md b/website/docs/services/guardduty/members/index.md
index 3ec9c55ff..daad93eae 100644
--- a/website/docs/services/guardduty/members/index.md
+++ b/website/docs/services/guardduty/members/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>member</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "status",
@@ -70,6 +79,28 @@ Creates, updates, deletes or gets a <code>member</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "member_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "detector_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html"><code>AWS::GuardDuty::Member</code></a>.
 
@@ -79,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>members</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Email, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>members</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>members</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>members_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>members</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>member</code>.
 ```sql
 SELECT
@@ -125,6 +171,20 @@ detector_id
 FROM awscc.guardduty.members
 WHERE region = 'us-east-1' AND data__Identifier = '<DetectorId>|<MemberId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>members</code> in a region.
+```sql
+SELECT
+region,
+detector_id,
+member_id
+FROM awscc.guardduty.members_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +265,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.guardduty.members
+SET data__PatchDocument = string('{{ {
+    "Status": status,
+    "Email": email,
+    "Message": message,
+    "DisableEmailNotification": disable_email_notification
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DetectorId>|<MemberId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/guardduty/members_list_only/index.md b/website/docs/services/guardduty/members_list_only/index.md
deleted file mode 100644
index 334709720..000000000
--- a/website/docs/services/guardduty/members_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: members_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - members_list_only
-  - guardduty
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>members</code> in a region or regions, for all properties use <a href="/services/guardduty/members/"><code>members</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>members_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::GuardDuty::Member</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.guardduty.members_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "member_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "detector_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>members</code> in a region.
-```sql
-SELECT
-region,
-detector_id,
-member_id
-FROM awscc.guardduty.members_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>members_list_only</code> resource, see <a href="/services/guardduty/members/#permissions"><code>members</code></a>
-
diff --git a/website/docs/services/guardduty/publishing_destinations/index.md b/website/docs/services/guardduty/publishing_destinations/index.md
index 91e6a00a3..3da5d3c34 100644
--- a/website/docs/services/guardduty/publishing_destinations/index.md
+++ b/website/docs/services/guardduty/publishing_destinations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>publishing_destination</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -99,6 +108,28 @@ Creates, updates, deletes or gets a <code>publishing_destination</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the publishing destination."
+  },
+  {
+    "name": "detector_id",
+    "type": "string",
+    "description": "The ID of the GuardDuty detector associated with the publishing destination."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-publishingdestination.html"><code>AWS::GuardDuty::PublishingDestination</code></a>.
 
@@ -108,31 +139,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>publishing_destinations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DetectorId, DestinationType, DestinationProperties, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>publishing_destinations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>publishing_destinations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>publishing_destinations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>publishing_destinations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +178,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>publishing_destination</code>.
 ```sql
 SELECT
@@ -155,6 +201,20 @@ tags
 FROM awscc.guardduty.publishing_destinations
 WHERE region = 'us-east-1' AND data__Identifier = '<DetectorId>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>publishing_destinations</code> in a region.
+```sql
+SELECT
+region,
+detector_id,
+id
+FROM awscc.guardduty.publishing_destinations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -235,6 +295,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.guardduty.publishing_destinations
+SET data__PatchDocument = string('{{ {
+    "DestinationType": destination_type,
+    "DestinationProperties": destination_properties,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DetectorId>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/guardduty/publishing_destinations_list_only/index.md b/website/docs/services/guardduty/publishing_destinations_list_only/index.md
deleted file mode 100644
index 9fb821c6b..000000000
--- a/website/docs/services/guardduty/publishing_destinations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: publishing_destinations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - publishing_destinations_list_only
-  - guardduty
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>publishing_destinations</code> in a region or regions, for all properties use <a href="/services/guardduty/publishing_destinations/"><code>publishing_destinations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>publishing_destinations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::GuardDuty::PublishingDestination.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.guardduty.publishing_destinations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the publishing destination."
-  },
-  {
-    "name": "detector_id",
-    "type": "string",
-    "description": "The ID of the GuardDuty detector associated with the publishing destination."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>publishing_destinations</code> in a region.
-```sql
-SELECT
-region,
-detector_id,
-id
-FROM awscc.guardduty.publishing_destinations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>publishing_destinations_list_only</code> resource, see <a href="/services/guardduty/publishing_destinations/#permissions"><code>publishing_destinations</code></a>
-
diff --git a/website/docs/services/guardduty/threat_entity_sets/index.md b/website/docs/services/guardduty/threat_entity_sets/index.md
index ba5d22a8d..5ff703e1e 100644
--- a/website/docs/services/guardduty/threat_entity_sets/index.md
+++ b/website/docs/services/guardduty/threat_entity_sets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>threat_entity_set</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -112,6 +121,28 @@ Creates, updates, deletes or gets a <code>threat_entity_set</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "detector_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatentityset.html"><code>AWS::GuardDuty::ThreatEntitySet</code></a>.
 
@@ -121,31 +152,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>threat_entity_sets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Format, Location, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>threat_entity_sets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>threat_entity_sets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>threat_entity_sets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>threat_entity_sets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -154,6 +191,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>threat_entity_set</code>.
 ```sql
 SELECT
@@ -173,6 +219,20 @@ tags
 FROM awscc.guardduty.threat_entity_sets
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>|<DetectorId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>threat_entity_sets</code> in a region.
+```sql
+SELECT
+region,
+id,
+detector_id
+FROM awscc.guardduty.threat_entity_sets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -261,6 +321,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.guardduty.threat_entity_sets
+SET data__PatchDocument = string('{{ {
+    "Activate": activate,
+    "Name": name,
+    "Location": location,
+    "ExpectedBucketOwner": expected_bucket_owner,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>|<DetectorId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/guardduty/threat_entity_sets_list_only/index.md b/website/docs/services/guardduty/threat_entity_sets_list_only/index.md
deleted file mode 100644
index c173bd449..000000000
--- a/website/docs/services/guardduty/threat_entity_sets_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: threat_entity_sets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - threat_entity_sets_list_only
-  - guardduty
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>threat_entity_sets</code> in a region or regions, for all properties use <a href="/services/guardduty/threat_entity_sets/"><code>threat_entity_sets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>threat_entity_sets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::GuardDuty::ThreatEntitySet</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.guardduty.threat_entity_sets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "detector_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>threat_entity_sets</code> in a region.
-```sql
-SELECT
-region,
-id,
-detector_id
-FROM awscc.guardduty.threat_entity_sets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>threat_entity_sets_list_only</code> resource, see <a href="/services/guardduty/threat_entity_sets/#permissions"><code>threat_entity_sets</code></a>
-
diff --git a/website/docs/services/guardduty/threat_intel_sets/index.md b/website/docs/services/guardduty/threat_intel_sets/index.md
index 85a39f7ac..6781778d0 100644
--- a/website/docs/services/guardduty/threat_intel_sets/index.md
+++ b/website/docs/services/guardduty/threat_intel_sets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>threat_intel_set</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -92,6 +101,28 @@ Creates, updates, deletes or gets a <code>threat_intel_set</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "detector_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html"><code>AWS::GuardDuty::ThreatIntelSet</code></a>.
 
@@ -101,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>threat_intel_sets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Format, Location, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>threat_intel_sets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>threat_intel_sets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>threat_intel_sets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>threat_intel_sets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>threat_intel_set</code>.
 ```sql
 SELECT
@@ -149,6 +195,20 @@ tags
 FROM awscc.guardduty.threat_intel_sets
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>|<DetectorId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>threat_intel_sets</code> in a region.
+```sql
+SELECT
+region,
+id,
+detector_id
+FROM awscc.guardduty.threat_intel_sets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -237,6 +297,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.guardduty.threat_intel_sets
+SET data__PatchDocument = string('{{ {
+    "Activate": activate,
+    "Name": name,
+    "Location": location,
+    "ExpectedBucketOwner": expected_bucket_owner,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>|<DetectorId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/guardduty/threat_intel_sets_list_only/index.md b/website/docs/services/guardduty/threat_intel_sets_list_only/index.md
deleted file mode 100644
index 63521217c..000000000
--- a/website/docs/services/guardduty/threat_intel_sets_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: threat_intel_sets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - threat_intel_sets_list_only
-  - guardduty
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>threat_intel_sets</code> in a region or regions, for all properties use <a href="/services/guardduty/threat_intel_sets/"><code>threat_intel_sets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>threat_intel_sets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::GuardDuty::ThreatIntelSet</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.guardduty.threat_intel_sets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "detector_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>threat_intel_sets</code> in a region.
-```sql
-SELECT
-region,
-id,
-detector_id
-FROM awscc.guardduty.threat_intel_sets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>threat_intel_sets_list_only</code> resource, see <a href="/services/guardduty/threat_intel_sets/#permissions"><code>threat_intel_sets</code></a>
-
diff --git a/website/docs/services/guardduty/trusted_entity_sets/index.md b/website/docs/services/guardduty/trusted_entity_sets/index.md
index 24e1207ea..c6e19f755 100644
--- a/website/docs/services/guardduty/trusted_entity_sets/index.md
+++ b/website/docs/services/guardduty/trusted_entity_sets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>trusted_entity_set</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -112,6 +121,28 @@ Creates, updates, deletes or gets a <code>trusted_entity_set</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "detector_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-trustedentityset.html"><code>AWS::GuardDuty::TrustedEntitySet</code></a>.
 
@@ -121,31 +152,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>trusted_entity_sets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Format, Location, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>trusted_entity_sets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>trusted_entity_sets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>trusted_entity_sets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>trusted_entity_sets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -154,6 +191,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>trusted_entity_set</code>.
 ```sql
 SELECT
@@ -173,6 +219,20 @@ tags
 FROM awscc.guardduty.trusted_entity_sets
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>|<DetectorId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>trusted_entity_sets</code> in a region.
+```sql
+SELECT
+region,
+id,
+detector_id
+FROM awscc.guardduty.trusted_entity_sets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -261,6 +321,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.guardduty.trusted_entity_sets
+SET data__PatchDocument = string('{{ {
+    "Activate": activate,
+    "Name": name,
+    "Location": location,
+    "ExpectedBucketOwner": expected_bucket_owner,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>|<DetectorId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/guardduty/trusted_entity_sets_list_only/index.md b/website/docs/services/guardduty/trusted_entity_sets_list_only/index.md
deleted file mode 100644
index 66812948e..000000000
--- a/website/docs/services/guardduty/trusted_entity_sets_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: trusted_entity_sets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - trusted_entity_sets_list_only
-  - guardduty
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>trusted_entity_sets</code> in a region or regions, for all properties use <a href="/services/guardduty/trusted_entity_sets/"><code>trusted_entity_sets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>trusted_entity_sets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::GuardDuty::TrustedEntitySet</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.guardduty.trusted_entity_sets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "detector_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>trusted_entity_sets</code> in a region.
-```sql
-SELECT
-region,
-id,
-detector_id
-FROM awscc.guardduty.trusted_entity_sets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>trusted_entity_sets_list_only</code> resource, see <a href="/services/guardduty/trusted_entity_sets/#permissions"><code>trusted_entity_sets</code></a>
-
diff --git a/website/docs/services/healthimaging/datastores/index.md b/website/docs/services/healthimaging/datastores/index.md
index a9067bb7b..9455a9bdd 100644
--- a/website/docs/services/healthimaging/datastores/index.md
+++ b/website/docs/services/healthimaging/datastores/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>datastore</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "datastore_arn",
@@ -80,6 +89,23 @@ Creates, updates, deletes or gets a <code>datastore</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "datastore_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-healthimaging-datastore.html"><code>AWS::HealthImaging::Datastore</code></a>.
 
@@ -89,26 +115,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>datastores</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>datastores</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>datastores_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>datastores</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +148,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>datastore</code>.
 ```sql
 SELECT
@@ -132,6 +172,19 @@ tags
 FROM awscc.healthimaging.datastores
 WHERE region = 'us-east-1' AND data__Identifier = '<DatastoreId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>datastores</code> in a region.
+```sql
+SELECT
+region,
+datastore_id
+FROM awscc.healthimaging.datastores_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -200,6 +253,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/healthimaging/datastores_list_only/index.md b/website/docs/services/healthimaging/datastores_list_only/index.md
deleted file mode 100644
index c05f2c801..000000000
--- a/website/docs/services/healthimaging/datastores_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: datastores_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - datastores_list_only
-  - healthimaging
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>datastores</code> in a region or regions, for all properties use <a href="/services/healthimaging/datastores/"><code>datastores</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>datastores_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::HealthImaging::Datastore Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.healthimaging.datastores_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "datastore_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>datastores</code> in a region.
-```sql
-SELECT
-region,
-datastore_id
-FROM awscc.healthimaging.datastores_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>datastores_list_only</code> resource, see <a href="/services/healthimaging/datastores/#permissions"><code>datastores</code></a>
-
diff --git a/website/docs/services/healthimaging/index.md b/website/docs/services/healthimaging/index.md
index 1a412065c..61c2ec4f6 100644
--- a/website/docs/services/healthimaging/index.md
+++ b/website/docs/services/healthimaging/index.md
@@ -20,7 +20,7 @@ The healthimaging service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The healthimaging service documentation.
 <a href="/services/healthimaging/datastores/">datastores</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/healthimaging/datastores_list_only/">datastores_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/healthlake/fhir_datastores/index.md b/website/docs/services/healthlake/fhir_datastores/index.md
index 81b25e440..ee6233c77 100644
--- a/website/docs/services/healthlake/fhir_datastores/index.md
+++ b/website/docs/services/healthlake/fhir_datastores/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>fhir_datastore</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "created_at",
@@ -167,6 +176,23 @@ Creates, updates, deletes or gets a <code>fhir_datastore</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "datastore_id",
+    "type": "string",
+    "description": "The AWS-generated ID number for the Data Store."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-healthlake-fhirdatastore.html"><code>AWS::HealthLake::FHIRDatastore</code></a>.
 
@@ -176,31 +202,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>fhir_datastores</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DatastoreTypeVersion, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>fhir_datastores</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>fhir_datastores</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>fhir_datastores_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>fhir_datastores</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -209,6 +241,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>fhir_datastore</code>.
 ```sql
 SELECT
@@ -227,6 +268,19 @@ tags
 FROM awscc.healthlake.fhir_datastores
 WHERE region = 'us-east-1' AND data__Identifier = '<DatastoreId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>fhir_datastores</code> in a region.
+```sql
+SELECT
+region,
+datastore_id
+FROM awscc.healthlake.fhir_datastores_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -317,6 +371,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.healthlake.fhir_datastores
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DatastoreId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/healthlake/fhir_datastores_list_only/index.md b/website/docs/services/healthlake/fhir_datastores_list_only/index.md
deleted file mode 100644
index 76230cc52..000000000
--- a/website/docs/services/healthlake/fhir_datastores_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: fhir_datastores_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - fhir_datastores_list_only
-  - healthlake
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>fhir_datastores</code> in a region or regions, for all properties use <a href="/services/healthlake/fhir_datastores/"><code>fhir_datastores</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>fhir_datastores_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>HealthLake FHIR Datastore</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.healthlake.fhir_datastores_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "datastore_id",
-    "type": "string",
-    "description": "The AWS-generated ID number for the Data Store."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>fhir_datastores</code> in a region.
-```sql
-SELECT
-region,
-datastore_id
-FROM awscc.healthlake.fhir_datastores_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>fhir_datastores_list_only</code> resource, see <a href="/services/healthlake/fhir_datastores/#permissions"><code>fhir_datastores</code></a>
-
diff --git a/website/docs/services/healthlake/index.md b/website/docs/services/healthlake/index.md
index e5cbd2333..2328f4d40 100644
--- a/website/docs/services/healthlake/index.md
+++ b/website/docs/services/healthlake/index.md
@@ -20,7 +20,7 @@ The healthlake service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The healthlake service documentation.
 <a href="/services/healthlake/fhir_datastores/">fhir_datastores</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/healthlake/fhir_datastores_list_only/">fhir_datastores_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/iam/group_policies/index.md b/website/docs/services/iam/group_policies/index.md
index 3febb46d1..7a51c7ee8 100644
--- a/website/docs/services/iam/group_policies/index.md
+++ b/website/docs/services/iam/group_policies/index.md
@@ -172,6 +172,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iam.group_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyDocument": policy_document
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PolicyName>|<GroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iam/groups/index.md b/website/docs/services/iam/groups/index.md
index 5efad7287..5e4008fd0 100644
--- a/website/docs/services/iam/groups/index.md
+++ b/website/docs/services/iam/groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>group</code> resource or lists <code>g
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>group</code> resource or lists <code>g
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "group_name",
+    "type": "string",
+    "description": "The name of the group to create. Do not include the path in this value.<br />The group name must be unique within the account. Group names are not distinguished by case. For example, you cannot create groups named both \"ADMINS\" and \"admins\". If you don't specify a name, CFN generates a unique physical ID and uses that ID for the group name.<br />If you specify a name, you cannot perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name.<br />If you specify a name, you must specify the &#96;&#96;CAPABILITY&#95;NAMED&#95;IAM&#96;&#96; value to acknowledge your template's capabilities. For more information, see &#91;Acknowledging Resources in Templates&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#using-iam-capabilities).<br />Naming an IAM resource can cause an unrecoverable error if you reuse the same template in multiple Regions. To prevent this, we recommend using &#96;&#96;Fn::Join&#96;&#96; and &#96;&#96;AWS::Region&#96;&#96; to create a Region-specific name, as in the following example: &#96;&#96;&#123;\"Fn::Join\": &#91;\"\", &#91;&#123;\"Ref\": \"AWS::Region\"&#125;, &#123;\"Ref\": \"MyResourceName\"&#125;&#93;&#93;&#125;&#96;&#96;."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-group.html"><code>AWS::IAM::Group</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>group</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ policies
 FROM awscc.iam.groups
 WHERE data__Identifier = '<GroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>groups</code> in a region.
+```sql
+SELECT
+region,
+group_name
+FROM awscc.iam.groups_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -212,6 +266,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iam.groups
+SET data__PatchDocument = string('{{ {
+    "ManagedPolicyArns": managed_policy_arns,
+    "Path": path,
+    "Policies": policies
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<GroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iam/groups_list_only/index.md b/website/docs/services/iam/groups_list_only/index.md
deleted file mode 100644
index ccf3cb69e..000000000
--- a/website/docs/services/iam/groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - groups_list_only
-  - iam
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>groups</code> in a region or regions, for all properties use <a href="/services/iam/groups/"><code>groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a new group.<br />For information about the number of groups you can create, see &#91;Limitations on Entities&#93;(https://docs.aws.amazon.com/IAM/latest/UserGuide/LimitationsOnEntities.html) in the &#42;User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iam.groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "group_name",
-    "type": "string",
-    "description": "The name of the group to create. Do not include the path in this value.<br />The group name must be unique within the account. Group names are not distinguished by case. For example, you cannot create groups named both \"ADMINS\" and \"admins\". If you don't specify a name, CFN generates a unique physical ID and uses that ID for the group name.<br />If you specify a name, you cannot perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name.<br />If you specify a name, you must specify the &#96;&#96;CAPABILITY&#95;NAMED&#95;IAM&#96;&#96; value to acknowledge your template's capabilities. For more information, see &#91;Acknowledging Resources in Templates&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#using-iam-capabilities).<br />Naming an IAM resource can cause an unrecoverable error if you reuse the same template in multiple Regions. To prevent this, we recommend using &#96;&#96;Fn::Join&#96;&#96; and &#96;&#96;AWS::Region&#96;&#96; to create a Region-specific name, as in the following example: &#96;&#96;&#123;\"Fn::Join\": &#91;\"\", &#91;&#123;\"Ref\": \"AWS::Region\"&#125;, &#123;\"Ref\": \"MyResourceName\"&#125;&#93;&#93;&#125;&#96;&#96;."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>groups</code> in a region.
-```sql
-SELECT
-region,
-group_name
-FROM awscc.iam.groups_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>groups_list_only</code> resource, see <a href="/services/iam/groups/#permissions"><code>groups</code></a>
-
diff --git a/website/docs/services/iam/index.md b/website/docs/services/iam/index.md
index 681f9bd83..53726d427 100644
--- a/website/docs/services/iam/index.md
+++ b/website/docs/services/iam/index.md
@@ -20,7 +20,7 @@ The iam service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>22</b></span><br />
+<span>total resources:&nbsp;<b>13</b></span><br />
 </div>
 </div>
 
@@ -31,27 +31,18 @@ The iam service documentation.
 <div class="providerDocColumn">
 <a href="/services/iam/group_policies/">group_policies</a><br />
 <a href="/services/iam/groups/">groups</a><br />
-<a href="/services/iam/groups_list_only/">groups_list_only</a><br />
 <a href="/services/iam/instance_profiles/">instance_profiles</a><br />
-<a href="/services/iam/instance_profiles_list_only/">instance_profiles_list_only</a><br />
 <a href="/services/iam/managed_policies/">managed_policies</a><br />
-<a href="/services/iam/managed_policies_list_only/">managed_policies_list_only</a><br />
 <a href="/services/iam/oidc_providers/">oidc_providers</a><br />
-<a href="/services/iam/oidc_providers_list_only/">oidc_providers_list_only</a><br />
 <a href="/services/iam/role_policies/">role_policies</a><br />
 <a href="/services/iam/roles/">roles</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/iam/roles_list_only/">roles_list_only</a><br />
 <a href="/services/iam/saml_providers/">saml_providers</a><br />
-<a href="/services/iam/saml_providers_list_only/">saml_providers_list_only</a><br />
 <a href="/services/iam/server_certificates/">server_certificates</a><br />
-<a href="/services/iam/server_certificates_list_only/">server_certificates_list_only</a><br />
 <a href="/services/iam/service_linked_roles/">service_linked_roles</a><br />
 <a href="/services/iam/user_policies/">user_policies</a><br />
 <a href="/services/iam/users/">users</a><br />
-<a href="/services/iam/users_list_only/">users_list_only</a><br />
-<a href="/services/iam/virtualmfa_devices/">virtualmfa_devices</a><br />
-<a href="/services/iam/virtualmfa_devices_list_only/">virtualmfa_devices_list_only</a>
+<a href="/services/iam/virtualmfa_devices/">virtualmfa_devices</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/iam/instance_profiles/index.md b/website/docs/services/iam/instance_profiles/index.md
index 3ff0944dd..b81e48a10 100644
--- a/website/docs/services/iam/instance_profiles/index.md
+++ b/website/docs/services/iam/instance_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>instance_profile</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "path",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets an <code>instance_profile</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "instance_profile_name",
+    "type": "string",
+    "description": "The name of the instance profile to create.<br />This parameter allows (through its &#91;regex pattern&#93;(https://docs.aws.amazon.com/http://wikipedia.org/wiki/regex)) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: &#95;+=,.@-"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html"><code>AWS::IAM::InstanceProfile</code></a>.
 
@@ -69,31 +95,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>instance_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Roles, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>instance_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>instance_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>instance_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>instance_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +134,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>instance_profile</code>.
 ```sql
 SELECT
@@ -113,6 +154,19 @@ arn
 FROM awscc.iam.instance_profiles
 WHERE data__Identifier = '<InstanceProfileName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>instance_profiles</code> in a region.
+```sql
+SELECT
+region,
+instance_profile_name
+FROM awscc.iam.instance_profiles_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -182,6 +236,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iam.instance_profiles
+SET data__PatchDocument = string('{{ {
+    "Roles": roles
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InstanceProfileName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iam/instance_profiles_list_only/index.md b/website/docs/services/iam/instance_profiles_list_only/index.md
deleted file mode 100644
index 56e290371..000000000
--- a/website/docs/services/iam/instance_profiles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: instance_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - instance_profiles_list_only
-  - iam
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>instance_profiles</code> in a region or regions, for all properties use <a href="/services/iam/instance_profiles/"><code>instance_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>instance_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a new instance profile. For information about instance profiles, see &#91;Using instance profiles&#93;(https://docs.aws.amazon.com/IAM/latest/UserGuide/id&#95;roles&#95;use&#95;switch-role-ec2&#95;instance-profiles.html).<br />For information about the number of instance profiles you can create, see &#91;object quotas&#93;(https://docs.aws.amazon.com/IAM/latest/UserGuide/reference&#95;iam-quotas.html) in the &#42;User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iam.instance_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "instance_profile_name",
-    "type": "string",
-    "description": "The name of the instance profile to create.<br />This parameter allows (through its &#91;regex pattern&#93;(https://docs.aws.amazon.com/http://wikipedia.org/wiki/regex)) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: &#95;+=,.@-"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>instance_profiles</code> in a region.
-```sql
-SELECT
-region,
-instance_profile_name
-FROM awscc.iam.instance_profiles_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>instance_profiles_list_only</code> resource, see <a href="/services/iam/instance_profiles/#permissions"><code>instance_profiles</code></a>
-
diff --git a/website/docs/services/iam/managed_policies/index.md b/website/docs/services/iam/managed_policies/index.md
index 08b133dce..d3c6ce145 100644
--- a/website/docs/services/iam/managed_policies/index.md
+++ b/website/docs/services/iam/managed_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>managed_policy</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -115,6 +124,23 @@ Creates, updates, deletes or gets a <code>managed_policy</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "policy_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html"><code>AWS::IAM::ManagedPolicy</code></a>.
 
@@ -124,31 +150,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>managed_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PolicyDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>managed_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>managed_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>managed_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>managed_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -157,6 +189,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>managed_policy</code>.
 ```sql
 SELECT
@@ -179,6 +220,19 @@ policy_id
 FROM awscc.iam.managed_policies
 WHERE data__Identifier = '<PolicyArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>managed_policies</code> in a region.
+```sql
+SELECT
+region,
+policy_arn
+FROM awscc.iam.managed_policies_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -266,6 +320,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iam.managed_policies
+SET data__PatchDocument = string('{{ {
+    "Groups": groups,
+    "PolicyDocument": policy_document,
+    "Roles": roles,
+    "Users": users
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PolicyArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iam/managed_policies_list_only/index.md b/website/docs/services/iam/managed_policies_list_only/index.md
deleted file mode 100644
index 61607daa4..000000000
--- a/website/docs/services/iam/managed_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: managed_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - managed_policies_list_only
-  - iam
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>managed_policies</code> in a region or regions, for all properties use <a href="/services/iam/managed_policies/"><code>managed_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>managed_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a new managed policy for your AWS-account.<br />This operation creates a policy version with a version identifier of &#96;&#96;v1&#96;&#96; and sets v1 as the policy's default version. For more information about policy versions, see &#91;Versioning for managed policies&#93;(https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-versions.html) in the &#42;IAM User Guide&#42;.<br />As a best practice, you can validate your IAM policies. To learn more, see &#91;Validating IAM policies&#93;(https://docs.aws.amazon.com/IAM/latest/UserGuide/access&#95;policies&#95;policy-validator.html) in the &#42;IAM User Guide&#42;.<br />For more information about managed policies in general, see &#91;Managed policies and inline policies&#93;(https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) in the &#42;IAM User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iam.managed_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "policy_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>managed_policies</code> in a region.
-```sql
-SELECT
-region,
-policy_arn
-FROM awscc.iam.managed_policies_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>managed_policies_list_only</code> resource, see <a href="/services/iam/managed_policies/#permissions"><code>managed_policies</code></a>
-
diff --git a/website/docs/services/iam/oidc_providers/index.md b/website/docs/services/iam/oidc_providers/index.md
index 2d414deca..0614ff251 100644
--- a/website/docs/services/iam/oidc_providers/index.md
+++ b/website/docs/services/iam/oidc_providers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>oidc_provider</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "client_id_list",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets an <code>oidc_provider</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Amazon Resource Name (ARN) of the OIDC provider"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-oidcprovider.html"><code>AWS::IAM::OIDCProvider</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>oidc_providers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>oidc_providers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>oidc_providers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>oidc_providers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>oidc_providers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>oidc_provider</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.iam.oidc_providers
 WHERE data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>oidc_providers</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.iam.oidc_providers_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -213,6 +267,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iam.oidc_providers
+SET data__PatchDocument = string('{{ {
+    "ClientIdList": client_id_list,
+    "ThumbprintList": thumbprint_list,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iam/oidc_providers_list_only/index.md b/website/docs/services/iam/oidc_providers_list_only/index.md
deleted file mode 100644
index fe6c18851..000000000
--- a/website/docs/services/iam/oidc_providers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: oidc_providers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - oidc_providers_list_only
-  - iam
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>oidc_providers</code> in a region or regions, for all properties use <a href="/services/iam/oidc_providers/"><code>oidc_providers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>oidc_providers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IAM::OIDCProvider</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iam.oidc_providers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Amazon Resource Name (ARN) of the OIDC provider"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>oidc_providers</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.iam.oidc_providers_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>oidc_providers_list_only</code> resource, see <a href="/services/iam/oidc_providers/#permissions"><code>oidc_providers</code></a>
-
diff --git a/website/docs/services/iam/role_policies/index.md b/website/docs/services/iam/role_policies/index.md
index a52919245..29f1b59f4 100644
--- a/website/docs/services/iam/role_policies/index.md
+++ b/website/docs/services/iam/role_policies/index.md
@@ -172,6 +172,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iam.role_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyDocument": policy_document
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PolicyName>|<RoleName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iam/roles/index.md b/website/docs/services/iam/roles/index.md
index ad27c3784..640af8f6a 100644
--- a/website/docs/services/iam/roles/index.md
+++ b/website/docs/services/iam/roles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>role</code> resource or lists <code>ro
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -119,6 +128,23 @@ Creates, updates, deletes or gets a <code>role</code> resource or lists <code>ro
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "role_name",
+    "type": "string",
+    "description": "A name for the IAM role, up to 64 characters in length. For valid values, see the &#96;&#96;RoleName&#96;&#96; parameter for the &#91;CreateRole&#93;(https://docs.aws.amazon.com/IAM/latest/APIReference/API&#95;CreateRole.html) action in the &#42;User Guide&#42;.<br />This parameter allows (per its &#91;regex pattern&#93;(https://docs.aws.amazon.com/http://wikipedia.org/wiki/regex)) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: &#95;+=,.@-. The role name must be unique within the account. Role names are not distinguished by case. For example, you cannot create roles named both \"Role1\" and \"role1\".<br />If you don't specify a name, CFN generates a unique physical ID and uses that ID for the role name.<br />If you specify a name, you must specify the &#96;&#96;CAPABILITY&#95;NAMED&#95;IAM&#96;&#96; value to acknowledge your template's capabilities. For more information, see &#91;Acknowledging Resources in Templates&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#using-iam-capabilities).<br />Naming an IAM resource can cause an unrecoverable error if you reuse the same template in multiple Regions. To prevent this, we recommend using &#96;&#96;Fn::Join&#96;&#96; and &#96;&#96;AWS::Region&#96;&#96; to create a Region-specific name, as in the following example: &#96;&#96;&#123;\"Fn::Join\": &#91;\"\", &#91;&#123;\"Ref\": \"AWS::Region\"&#125;, &#123;\"Ref\": \"MyResourceName\"&#125;&#93;&#93;&#125;&#96;&#96;."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html"><code>AWS::IAM::Role</code></a>.
 
@@ -128,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>roles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AssumeRolePolicyDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>roles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>roles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>roles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>roles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>role</code>.
 ```sql
 SELECT
@@ -179,6 +220,19 @@ tags
 FROM awscc.iam.roles
 WHERE data__Identifier = '<RoleName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>roles</code> in a region.
+```sql
+SELECT
+region,
+role_name
+FROM awscc.iam.roles_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -276,6 +330,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iam.roles
+SET data__PatchDocument = string('{{ {
+    "AssumeRolePolicyDocument": assume_role_policy_document,
+    "Description": description,
+    "ManagedPolicyArns": managed_policy_arns,
+    "MaxSessionDuration": max_session_duration,
+    "PermissionsBoundary": permissions_boundary,
+    "Policies": policies,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RoleName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iam/roles_list_only/index.md b/website/docs/services/iam/roles_list_only/index.md
deleted file mode 100644
index 4bb9dbf43..000000000
--- a/website/docs/services/iam/roles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: roles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - roles_list_only
-  - iam
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>roles</code> in a region or regions, for all properties use <a href="/services/iam/roles/"><code>roles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>roles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a new role for your AWS-account.<br />For more information about roles, see &#91;IAM roles&#93;(https://docs.aws.amazon.com/IAM/latest/UserGuide/id&#95;roles.html) in the &#42;IAM User Guide&#42;. For information about quotas for role names and the number of roles you can create, see &#91;IAM and quotas&#93;(https://docs.aws.amazon.com/IAM/latest/UserGuide/reference&#95;iam-quotas.html) in the &#42;IAM User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iam.roles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "role_name",
-    "type": "string",
-    "description": "A name for the IAM role, up to 64 characters in length. For valid values, see the &#96;&#96;RoleName&#96;&#96; parameter for the &#91;CreateRole&#93;(https://docs.aws.amazon.com/IAM/latest/APIReference/API&#95;CreateRole.html) action in the &#42;User Guide&#42;.<br />This parameter allows (per its &#91;regex pattern&#93;(https://docs.aws.amazon.com/http://wikipedia.org/wiki/regex)) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: &#95;+=,.@-. The role name must be unique within the account. Role names are not distinguished by case. For example, you cannot create roles named both \"Role1\" and \"role1\".<br />If you don't specify a name, CFN generates a unique physical ID and uses that ID for the role name.<br />If you specify a name, you must specify the &#96;&#96;CAPABILITY&#95;NAMED&#95;IAM&#96;&#96; value to acknowledge your template's capabilities. For more information, see &#91;Acknowledging Resources in Templates&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#using-iam-capabilities).<br />Naming an IAM resource can cause an unrecoverable error if you reuse the same template in multiple Regions. To prevent this, we recommend using &#96;&#96;Fn::Join&#96;&#96; and &#96;&#96;AWS::Region&#96;&#96; to create a Region-specific name, as in the following example: &#96;&#96;&#123;\"Fn::Join\": &#91;\"\", &#91;&#123;\"Ref\": \"AWS::Region\"&#125;, &#123;\"Ref\": \"MyResourceName\"&#125;&#93;&#93;&#125;&#96;&#96;."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>roles</code> in a region.
-```sql
-SELECT
-region,
-role_name
-FROM awscc.iam.roles_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>roles_list_only</code> resource, see <a href="/services/iam/roles/#permissions"><code>roles</code></a>
-
diff --git a/website/docs/services/iam/saml_providers/index.md b/website/docs/services/iam/saml_providers/index.md
index 88a13f44b..52522d451 100644
--- a/website/docs/services/iam/saml_providers/index.md
+++ b/website/docs/services/iam/saml_providers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>saml_provider</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -109,6 +118,23 @@ Creates, updates, deletes or gets a <code>saml_provider</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Amazon Resource Name (ARN) of the SAML provider"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-samlprovider.html"><code>AWS::IAM::SAMLProvider</code></a>.
 
@@ -118,31 +144,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>saml_providers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>saml_providers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>saml_providers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>saml_providers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>saml_providers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +183,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>saml_provider</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ saml_provider_uu_id
 FROM awscc.iam.saml_providers
 WHERE data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>saml_providers</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.iam.saml_providers_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -267,6 +321,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iam.saml_providers
+SET data__PatchDocument = string('{{ {
+    "SamlMetadataDocument": saml_metadata_document,
+    "Tags": tags,
+    "AssertionEncryptionMode": assertion_encryption_mode,
+    "PrivateKeyList": private_key_list
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iam/saml_providers_list_only/index.md b/website/docs/services/iam/saml_providers_list_only/index.md
deleted file mode 100644
index dd1d193a1..000000000
--- a/website/docs/services/iam/saml_providers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: saml_providers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - saml_providers_list_only
-  - iam
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>saml_providers</code> in a region or regions, for all properties use <a href="/services/iam/saml_providers/"><code>saml_providers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>saml_providers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IAM::SAMLProvider</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iam.saml_providers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Amazon Resource Name (ARN) of the SAML provider"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>saml_providers</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.iam.saml_providers_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>saml_providers_list_only</code> resource, see <a href="/services/iam/saml_providers/#permissions"><code>saml_providers</code></a>
-
diff --git a/website/docs/services/iam/server_certificates/index.md b/website/docs/services/iam/server_certificates/index.md
index 1b967bfa2..a6aa75700 100644
--- a/website/docs/services/iam/server_certificates/index.md
+++ b/website/docs/services/iam/server_certificates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>server_certificate</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "certificate_body",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>server_certificate</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "server_certificate_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servercertificate.html"><code>AWS::IAM::ServerCertificate</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>server_certificates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>server_certificates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>server_certificates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>server_certificates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>server_certificates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>server_certificate</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.iam.server_certificates
 WHERE data__Identifier = '<ServerCertificateName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>server_certificates</code> in a region.
+```sql
+SELECT
+region,
+server_certificate_name
+FROM awscc.iam.server_certificates_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -235,6 +289,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iam.server_certificates
+SET data__PatchDocument = string('{{ {
+    "Path": path,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ServerCertificateName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iam/server_certificates_list_only/index.md b/website/docs/services/iam/server_certificates_list_only/index.md
deleted file mode 100644
index bea4dad39..000000000
--- a/website/docs/services/iam/server_certificates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: server_certificates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - server_certificates_list_only
-  - iam
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>server_certificates</code> in a region or regions, for all properties use <a href="/services/iam/server_certificates/"><code>server_certificates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>server_certificates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IAM::ServerCertificate</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iam.server_certificates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "server_certificate_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>server_certificates</code> in a region.
-```sql
-SELECT
-region,
-server_certificate_name
-FROM awscc.iam.server_certificates_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>server_certificates_list_only</code> resource, see <a href="/services/iam/server_certificates/#permissions"><code>server_certificates</code></a>
-
diff --git a/website/docs/services/iam/service_linked_roles/index.md b/website/docs/services/iam/service_linked_roles/index.md
index 0626d1cee..ef4fa958e 100644
--- a/website/docs/services/iam/service_linked_roles/index.md
+++ b/website/docs/services/iam/service_linked_roles/index.md
@@ -176,6 +176,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iam.service_linked_roles
+SET data__PatchDocument = string('{{ {
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RoleName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iam/user_policies/index.md b/website/docs/services/iam/user_policies/index.md
index 447ff9fa2..25589ec02 100644
--- a/website/docs/services/iam/user_policies/index.md
+++ b/website/docs/services/iam/user_policies/index.md
@@ -172,6 +172,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iam.user_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyDocument": policy_document
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PolicyName>|<UserName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iam/users/index.md b/website/docs/services/iam/users/index.md
index a5c533ed1..bb821a963 100644
--- a/website/docs/services/iam/users/index.md
+++ b/website/docs/services/iam/users/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>user</code> resource or lists <code>us
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "path",
@@ -121,6 +130,23 @@ Creates, updates, deletes or gets a <code>user</code> resource or lists <code>us
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "user_name",
+    "type": "string",
+    "description": "The name of the user to create. Do not include the path in this value.<br />This parameter allows (per its &#91;regex pattern&#93;(https://docs.aws.amazon.com/http://wikipedia.org/wiki/regex)) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: &#95;+=,.@-. The user name must be unique within the account. User names are not distinguished by case. For example, you cannot create users named both \"John\" and \"john\".<br />If you don't specify a name, CFN generates a unique physical ID and uses that ID for the user name.<br />If you specify a name, you must specify the &#96;&#96;CAPABILITY&#95;NAMED&#95;IAM&#96;&#96; value to acknowledge your template's capabilities. For more information, see &#91;Acknowledging Resources in Templates&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#using-iam-capabilities).<br />Naming an IAM resource can cause an unrecoverable error if you reuse the same template in multiple Regions. To prevent this, we recommend using &#96;&#96;Fn::Join&#96;&#96; and &#96;&#96;AWS::Region&#96;&#96; to create a Region-specific name, as in the following example: &#96;&#96;&#123;\"Fn::Join\": &#91;\"\", &#91;&#123;\"Ref\": \"AWS::Region\"&#125;, &#123;\"Ref\": \"MyResourceName\"&#125;&#93;&#93;&#125;&#96;&#96;."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-user.html"><code>AWS::IAM::User</code></a>.
 
@@ -130,31 +156,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>users</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>users</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>users</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>users_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>users</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -163,6 +195,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user</code>.
 ```sql
 SELECT
@@ -179,6 +220,19 @@ permissions_boundary
 FROM awscc.iam.users
 WHERE data__Identifier = '<UserName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>users</code> in a region.
+```sql
+SELECT
+region,
+user_name
+FROM awscc.iam.users_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -289,6 +343,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iam.users
+SET data__PatchDocument = string('{{ {
+    "Path": path,
+    "ManagedPolicyArns": managed_policy_arns,
+    "Policies": policies,
+    "Groups": groups,
+    "LoginProfile": login_profile,
+    "Tags": tags,
+    "PermissionsBoundary": permissions_boundary
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iam/users_list_only/index.md b/website/docs/services/iam/users_list_only/index.md
deleted file mode 100644
index 806e6d0c7..000000000
--- a/website/docs/services/iam/users_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: users_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - users_list_only
-  - iam
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>users</code> in a region or regions, for all properties use <a href="/services/iam/users/"><code>users</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>users_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a new IAM user for your AWS-account.<br />For information about quotas for the number of IAM users you can create, see &#91;IAM and quotas&#93;(https://docs.aws.amazon.com/IAM/latest/UserGuide/reference&#95;iam-quotas.html) in the &#42;IAM User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iam.users_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "user_name",
-    "type": "string",
-    "description": "The name of the user to create. Do not include the path in this value.<br />This parameter allows (per its &#91;regex pattern&#93;(https://docs.aws.amazon.com/http://wikipedia.org/wiki/regex)) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: &#95;+=,.@-. The user name must be unique within the account. User names are not distinguished by case. For example, you cannot create users named both \"John\" and \"john\".<br />If you don't specify a name, CFN generates a unique physical ID and uses that ID for the user name.<br />If you specify a name, you must specify the &#96;&#96;CAPABILITY&#95;NAMED&#95;IAM&#96;&#96; value to acknowledge your template's capabilities. For more information, see &#91;Acknowledging Resources in Templates&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#using-iam-capabilities).<br />Naming an IAM resource can cause an unrecoverable error if you reuse the same template in multiple Regions. To prevent this, we recommend using &#96;&#96;Fn::Join&#96;&#96; and &#96;&#96;AWS::Region&#96;&#96; to create a Region-specific name, as in the following example: &#96;&#96;&#123;\"Fn::Join\": &#91;\"\", &#91;&#123;\"Ref\": \"AWS::Region\"&#125;, &#123;\"Ref\": \"MyResourceName\"&#125;&#93;&#93;&#125;&#96;&#96;."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>users</code> in a region.
-```sql
-SELECT
-region,
-user_name
-FROM awscc.iam.users_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>users_list_only</code> resource, see <a href="/services/iam/users/#permissions"><code>users</code></a>
-
diff --git a/website/docs/services/iam/virtualmfa_devices/index.md b/website/docs/services/iam/virtualmfa_devices/index.md
index c0c36258b..a934e9183 100644
--- a/website/docs/services/iam/virtualmfa_devices/index.md
+++ b/website/docs/services/iam/virtualmfa_devices/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>virtualmfa_device</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "virtual_mfa_device_name",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>virtualmfa_device</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "serial_number",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-virtualmfadevice.html"><code>AWS::IAM::VirtualMFADevice</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>virtualmfa_devices</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Users, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>virtualmfa_devices</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>virtualmfa_devices</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>virtualmfa_devices_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>virtualmfa_devices</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>virtualmfa_device</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.iam.virtualmfa_devices
 WHERE data__Identifier = '<SerialNumber>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>virtualmfa_devices</code> in a region.
+```sql
+SELECT
+region,
+serial_number
+FROM awscc.iam.virtualmfa_devices_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -206,6 +260,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iam.virtualmfa_devices
+SET data__PatchDocument = string('{{ {
+    "Users": users,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SerialNumber>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iam/virtualmfa_devices_list_only/index.md b/website/docs/services/iam/virtualmfa_devices_list_only/index.md
deleted file mode 100644
index d20d115bf..000000000
--- a/website/docs/services/iam/virtualmfa_devices_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: virtualmfa_devices_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - virtualmfa_devices_list_only
-  - iam
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>virtualmfa_devices</code> in a region or regions, for all properties use <a href="/services/iam/virtualmfa_devices/"><code>virtualmfa_devices</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>virtualmfa_devices_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IAM::VirtualMFADevice</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iam.virtualmfa_devices_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "serial_number",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>virtualmfa_devices</code> in a region.
-```sql
-SELECT
-region,
-serial_number
-FROM awscc.iam.virtualmfa_devices_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>virtualmfa_devices_list_only</code> resource, see <a href="/services/iam/virtualmfa_devices/#permissions"><code>virtualmfa_devices</code></a>
-
diff --git a/website/docs/services/identitystore/group_memberships/index.md b/website/docs/services/identitystore/group_memberships/index.md
index a6db0b985..6c92e4e05 100644
--- a/website/docs/services/identitystore/group_memberships/index.md
+++ b/website/docs/services/identitystore/group_memberships/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>group_membership</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "group_id",
@@ -67,6 +76,28 @@ Creates, updates, deletes or gets a <code>group_membership</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "identity_store_id",
+    "type": "string",
+    "description": "The globally unique identifier for the identity store."
+  },
+  {
+    "name": "membership_id",
+    "type": "string",
+    "description": "The identifier for a GroupMembership in the identity store."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-identitystore-groupmembership.html"><code>AWS::IdentityStore::GroupMembership</code></a>.
 
@@ -76,26 +107,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>group_memberships</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IdentityStoreId, GroupId, MemberId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>group_memberships</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>group_memberships_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>group_memberships</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -104,6 +140,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>group_membership</code>.
 ```sql
 SELECT
@@ -115,6 +160,20 @@ membership_id
 FROM awscc.identitystore.group_memberships
 WHERE region = 'us-east-1' AND data__Identifier = '<MembershipId>|<IdentityStoreId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>group_memberships</code> in a region.
+```sql
+SELECT
+region,
+membership_id,
+identity_store_id
+FROM awscc.identitystore.group_memberships_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -188,6 +247,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/identitystore/group_memberships_list_only/index.md b/website/docs/services/identitystore/group_memberships_list_only/index.md
deleted file mode 100644
index a19bb6470..000000000
--- a/website/docs/services/identitystore/group_memberships_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: group_memberships_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - group_memberships_list_only
-  - identitystore
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>group_memberships</code> in a region or regions, for all properties use <a href="/services/identitystore/group_memberships/"><code>group_memberships</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>group_memberships_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type Definition for AWS:IdentityStore::GroupMembership</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.identitystore.group_memberships_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "identity_store_id",
-    "type": "string",
-    "description": "The globally unique identifier for the identity store."
-  },
-  {
-    "name": "membership_id",
-    "type": "string",
-    "description": "The identifier for a GroupMembership in the identity store."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>group_memberships</code> in a region.
-```sql
-SELECT
-region,
-membership_id,
-identity_store_id
-FROM awscc.identitystore.group_memberships_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>group_memberships_list_only</code> resource, see <a href="/services/identitystore/group_memberships/#permissions"><code>group_memberships</code></a>
-
diff --git a/website/docs/services/identitystore/groups/index.md b/website/docs/services/identitystore/groups/index.md
index f9edabd2f..da7c83359 100644
--- a/website/docs/services/identitystore/groups/index.md
+++ b/website/docs/services/identitystore/groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>group</code> resource or lists <code>g
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets a <code>group</code> resource or lists <code>g
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "group_id",
+    "type": "string",
+    "description": "The unique identifier for a group in the identity store."
+  },
+  {
+    "name": "identity_store_id",
+    "type": "string",
+    "description": "The globally unique identifier for the identity store."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-identitystore-group.html"><code>AWS::IdentityStore::Group</code></a>.
 
@@ -69,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IdentityStoreId, DisplayName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>group</code>.
 ```sql
 SELECT
@@ -113,6 +159,20 @@ identity_store_id
 FROM awscc.identitystore.groups
 WHERE region = 'us-east-1' AND data__Identifier = '<GroupId>|<IdentityStoreId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>groups</code> in a region.
+```sql
+SELECT
+region,
+group_id,
+identity_store_id
+FROM awscc.identitystore.groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -183,6 +243,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.identitystore.groups
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "DisplayName": display_name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<GroupId>|<IdentityStoreId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/identitystore/groups_list_only/index.md b/website/docs/services/identitystore/groups_list_only/index.md
deleted file mode 100644
index 6fd0d8953..000000000
--- a/website/docs/services/identitystore/groups_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - groups_list_only
-  - identitystore
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>groups</code> in a region or regions, for all properties use <a href="/services/identitystore/groups/"><code>groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IdentityStore::Group</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.identitystore.groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "group_id",
-    "type": "string",
-    "description": "The unique identifier for a group in the identity store."
-  },
-  {
-    "name": "identity_store_id",
-    "type": "string",
-    "description": "The globally unique identifier for the identity store."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>groups</code> in a region.
-```sql
-SELECT
-region,
-group_id,
-identity_store_id
-FROM awscc.identitystore.groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>groups_list_only</code> resource, see <a href="/services/identitystore/groups/#permissions"><code>groups</code></a>
-
diff --git a/website/docs/services/identitystore/index.md b/website/docs/services/identitystore/index.md
index f2a25c454..6540d679d 100644
--- a/website/docs/services/identitystore/index.md
+++ b/website/docs/services/identitystore/index.md
@@ -20,7 +20,7 @@ The identitystore service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The identitystore service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/identitystore/group_memberships/">group_memberships</a><br />
-<a href="/services/identitystore/group_memberships_list_only/">group_memberships_list_only</a>
+<a href="/services/identitystore/group_memberships/">group_memberships</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/identitystore/groups/">groups</a><br />
-<a href="/services/identitystore/groups_list_only/">groups_list_only</a>
+<a href="/services/identitystore/groups/">groups</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/imagebuilder/components/index.md b/website/docs/services/imagebuilder/components/index.md
index afdaf46c3..945020fa6 100644
--- a/website/docs/services/imagebuilder/components/index.md
+++ b/website/docs/services/imagebuilder/components/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>component</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -105,6 +114,23 @@ Creates, updates, deletes or gets a <code>component</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the component."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-component.html"><code>AWS::ImageBuilder::Component</code></a>.
 
@@ -114,31 +140,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>components</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Platform, Version, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>components</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>components</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>components_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>components</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -147,6 +179,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>component</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ supported_os_versions
 FROM awscc.imagebuilder.components
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>components</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.imagebuilder.components_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -268,6 +322,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.imagebuilder.components
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/imagebuilder/components_list_only/index.md b/website/docs/services/imagebuilder/components_list_only/index.md
deleted file mode 100644
index e6c4af5f3..000000000
--- a/website/docs/services/imagebuilder/components_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: components_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - components_list_only
-  - imagebuilder
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>components</code> in a region or regions, for all properties use <a href="/services/imagebuilder/components/"><code>components</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>components_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::ImageBuilder::Component</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.imagebuilder.components_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the component."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>components</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.imagebuilder.components_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>components_list_only</code> resource, see <a href="/services/imagebuilder/components/#permissions"><code>components</code></a>
-
diff --git a/website/docs/services/imagebuilder/container_recipes/index.md b/website/docs/services/imagebuilder/container_recipes/index.md
index 924649079..c447a2344 100644
--- a/website/docs/services/imagebuilder/container_recipes/index.md
+++ b/website/docs/services/imagebuilder/container_recipes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>container_recipe</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -232,6 +241,23 @@ Creates, updates, deletes or gets a <code>container_recipe</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the container recipe."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html"><code>AWS::ImageBuilder::ContainerRecipe</code></a>.
 
@@ -241,31 +267,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>container_recipes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>container_recipes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>container_recipes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>container_recipes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>container_recipes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -274,6 +306,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>container_recipe</code>.
 ```sql
 SELECT
@@ -297,6 +338,19 @@ tags
 FROM awscc.imagebuilder.container_recipes
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>container_recipes</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.imagebuilder.container_recipes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -462,6 +516,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.imagebuilder.container_recipes
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/imagebuilder/container_recipes_list_only/index.md b/website/docs/services/imagebuilder/container_recipes_list_only/index.md
deleted file mode 100644
index 59443227f..000000000
--- a/website/docs/services/imagebuilder/container_recipes_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: container_recipes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - container_recipes_list_only
-  - imagebuilder
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>container_recipes</code> in a region or regions, for all properties use <a href="/services/imagebuilder/container_recipes/"><code>container_recipes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>container_recipes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::ImageBuilder::ContainerRecipe</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.imagebuilder.container_recipes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the container recipe."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>container_recipes</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.imagebuilder.container_recipes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>container_recipes_list_only</code> resource, see <a href="/services/imagebuilder/container_recipes/#permissions"><code>container_recipes</code></a>
-
diff --git a/website/docs/services/imagebuilder/distribution_configurations/index.md b/website/docs/services/imagebuilder/distribution_configurations/index.md
index 059c4e56e..c887e9c19 100644
--- a/website/docs/services/imagebuilder/distribution_configurations/index.md
+++ b/website/docs/services/imagebuilder/distribution_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>distribution_configuration</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -270,6 +279,23 @@ Creates, updates, deletes or gets a <code>distribution_configuration</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the distribution configuration."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-distributionconfiguration.html"><code>AWS::ImageBuilder::DistributionConfiguration</code></a>.
 
@@ -279,31 +305,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>distribution_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Distributions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>distribution_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>distribution_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>distribution_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>distribution_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -312,6 +344,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>distribution_configuration</code>.
 ```sql
 SELECT
@@ -324,6 +365,19 @@ tags
 FROM awscc.imagebuilder.distribution_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>distribution_configurations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.imagebuilder.distribution_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -442,6 +496,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.imagebuilder.distribution_configurations
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Distributions": distributions,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/imagebuilder/distribution_configurations_list_only/index.md b/website/docs/services/imagebuilder/distribution_configurations_list_only/index.md
deleted file mode 100644
index cd3fbcb45..000000000
--- a/website/docs/services/imagebuilder/distribution_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: distribution_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - distribution_configurations_list_only
-  - imagebuilder
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>distribution_configurations</code> in a region or regions, for all properties use <a href="/services/imagebuilder/distribution_configurations/"><code>distribution_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>distribution_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::ImageBuilder::DistributionConfiguration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.imagebuilder.distribution_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the distribution configuration."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>distribution_configurations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.imagebuilder.distribution_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>distribution_configurations_list_only</code> resource, see <a href="/services/imagebuilder/distribution_configurations/#permissions"><code>distribution_configurations</code></a>
-
diff --git a/website/docs/services/imagebuilder/image_pipelines/index.md b/website/docs/services/imagebuilder/image_pipelines/index.md
index ba18fb853..fc527acb2 100644
--- a/website/docs/services/imagebuilder/image_pipelines/index.md
+++ b/website/docs/services/imagebuilder/image_pipelines/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>image_pipeline</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -197,6 +206,23 @@ Creates, updates, deletes or gets an <code>image_pipeline</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the image pipeline."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagepipeline.html"><code>AWS::ImageBuilder::ImagePipeline</code></a>.
 
@@ -206,31 +232,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>image_pipelines</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>image_pipelines</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>image_pipelines</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>image_pipelines_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>image_pipelines</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -239,6 +271,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>image_pipeline</code>.
 ```sql
 SELECT
@@ -261,6 +302,19 @@ tags
 FROM awscc.imagebuilder.image_pipelines
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>image_pipelines</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.imagebuilder.image_pipelines_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -415,6 +469,31 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.imagebuilder.image_pipelines
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "ImageTestsConfiguration": image_tests_configuration,
+    "Status": status,
+    "Schedule": schedule,
+    "ImageRecipeArn": image_recipe_arn,
+    "ContainerRecipeArn": container_recipe_arn,
+    "DistributionConfigurationArn": distribution_configuration_arn,
+    "InfrastructureConfigurationArn": infrastructure_configuration_arn,
+    "Workflows": workflows,
+    "EnhancedImageMetadataEnabled": enhanced_image_metadata_enabled,
+    "ImageScanningConfiguration": image_scanning_configuration,
+    "ExecutionRole": execution_role,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/imagebuilder/image_pipelines_list_only/index.md b/website/docs/services/imagebuilder/image_pipelines_list_only/index.md
deleted file mode 100644
index e0bc7cdd3..000000000
--- a/website/docs/services/imagebuilder/image_pipelines_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: image_pipelines_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - image_pipelines_list_only
-  - imagebuilder
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>image_pipelines</code> in a region or regions, for all properties use <a href="/services/imagebuilder/image_pipelines/"><code>image_pipelines</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>image_pipelines_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::ImageBuilder::ImagePipeline</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.imagebuilder.image_pipelines_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the image pipeline."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>image_pipelines</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.imagebuilder.image_pipelines_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>image_pipelines_list_only</code> resource, see <a href="/services/imagebuilder/image_pipelines/#permissions"><code>image_pipelines</code></a>
-
diff --git a/website/docs/services/imagebuilder/image_recipes/index.md b/website/docs/services/imagebuilder/image_recipes/index.md
index 5c1b6e006..b41a30f29 100644
--- a/website/docs/services/imagebuilder/image_recipes/index.md
+++ b/website/docs/services/imagebuilder/image_recipes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>image_recipe</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -197,6 +206,23 @@ Creates, updates, deletes or gets an <code>image_recipe</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the image recipe."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagerecipe.html"><code>AWS::ImageBuilder::ImageRecipe</code></a>.
 
@@ -206,31 +232,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>image_recipes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Version, Components, ParentImage, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>image_recipes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>image_recipes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>image_recipes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>image_recipes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -239,6 +271,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>image_recipe</code>.
 ```sql
 SELECT
@@ -256,6 +297,19 @@ tags
 FROM awscc.imagebuilder.image_recipes
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>image_recipes</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.imagebuilder.image_recipes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -374,6 +428,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.imagebuilder.image_recipes
+SET data__PatchDocument = string('{{ {
+    "AdditionalInstanceConfiguration": additional_instance_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/imagebuilder/image_recipes_list_only/index.md b/website/docs/services/imagebuilder/image_recipes_list_only/index.md
deleted file mode 100644
index 3c6589285..000000000
--- a/website/docs/services/imagebuilder/image_recipes_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: image_recipes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - image_recipes_list_only
-  - imagebuilder
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>image_recipes</code> in a region or regions, for all properties use <a href="/services/imagebuilder/image_recipes/"><code>image_recipes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>image_recipes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::ImageBuilder::ImageRecipe</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.imagebuilder.image_recipes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the image recipe."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>image_recipes</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.imagebuilder.image_recipes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>image_recipes_list_only</code> resource, see <a href="/services/imagebuilder/image_recipes/#permissions"><code>image_recipes</code></a>
-
diff --git a/website/docs/services/imagebuilder/images/index.md b/website/docs/services/imagebuilder/images/index.md
index 33a0d6089..48b8bf300 100644
--- a/website/docs/services/imagebuilder/images/index.md
+++ b/website/docs/services/imagebuilder/images/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>image</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "image_scanning_configuration",
@@ -180,6 +189,23 @@ Creates, updates, deletes or gets an <code>image</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the image."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-image.html"><code>AWS::ImageBuilder::Image</code></a>.
 
@@ -189,31 +215,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>images</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>images</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>images</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>images_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>images</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -222,6 +254,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>image</code>.
 ```sql
 SELECT
@@ -243,6 +284,19 @@ tags
 FROM awscc.imagebuilder.images
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>images</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.imagebuilder.images_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -371,6 +425,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.imagebuilder.images
+SET data__PatchDocument = string('{{ {
+    "ExecutionRole": execution_role,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/imagebuilder/images_list_only/index.md b/website/docs/services/imagebuilder/images_list_only/index.md
deleted file mode 100644
index 49cfccfc7..000000000
--- a/website/docs/services/imagebuilder/images_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: images_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - images_list_only
-  - imagebuilder
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>images</code> in a region or regions, for all properties use <a href="/services/imagebuilder/images/"><code>images</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>images_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::ImageBuilder::Image</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.imagebuilder.images_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the image."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>images</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.imagebuilder.images_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>images_list_only</code> resource, see <a href="/services/imagebuilder/images/#permissions"><code>images</code></a>
-
diff --git a/website/docs/services/imagebuilder/index.md b/website/docs/services/imagebuilder/index.md
index 09a4830cd..e0dde23d4 100644
--- a/website/docs/services/imagebuilder/index.md
+++ b/website/docs/services/imagebuilder/index.md
@@ -20,7 +20,7 @@ The imagebuilder service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>18</b></span><br />
+<span>total resources:&nbsp;<b>9</b></span><br />
 </div>
 </div>
 
@@ -30,24 +30,15 @@ The imagebuilder service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/imagebuilder/components/">components</a><br />
-<a href="/services/imagebuilder/components_list_only/">components_list_only</a><br />
 <a href="/services/imagebuilder/container_recipes/">container_recipes</a><br />
-<a href="/services/imagebuilder/container_recipes_list_only/">container_recipes_list_only</a><br />
 <a href="/services/imagebuilder/distribution_configurations/">distribution_configurations</a><br />
-<a href="/services/imagebuilder/distribution_configurations_list_only/">distribution_configurations_list_only</a><br />
 <a href="/services/imagebuilder/image_pipelines/">image_pipelines</a><br />
-<a href="/services/imagebuilder/image_pipelines_list_only/">image_pipelines_list_only</a><br />
 <a href="/services/imagebuilder/image_recipes/">image_recipes</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/imagebuilder/image_recipes_list_only/">image_recipes_list_only</a><br />
 <a href="/services/imagebuilder/images/">images</a><br />
-<a href="/services/imagebuilder/images_list_only/">images_list_only</a><br />
 <a href="/services/imagebuilder/infrastructure_configurations/">infrastructure_configurations</a><br />
-<a href="/services/imagebuilder/infrastructure_configurations_list_only/">infrastructure_configurations_list_only</a><br />
 <a href="/services/imagebuilder/lifecycle_policies/">lifecycle_policies</a><br />
-<a href="/services/imagebuilder/lifecycle_policies_list_only/">lifecycle_policies_list_only</a><br />
-<a href="/services/imagebuilder/workflows/">workflows</a><br />
-<a href="/services/imagebuilder/workflows_list_only/">workflows_list_only</a>
+<a href="/services/imagebuilder/workflows/">workflows</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/imagebuilder/infrastructure_configurations/index.md b/website/docs/services/imagebuilder/infrastructure_configurations/index.md
index f62fca06d..871d3f0d9 100644
--- a/website/docs/services/imagebuilder/infrastructure_configurations/index.md
+++ b/website/docs/services/imagebuilder/infrastructure_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>infrastructure_configuration</code> r
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -168,6 +177,23 @@ Creates, updates, deletes or gets an <code>infrastructure_configuration</code> r
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the infrastructure configuration."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html"><code>AWS::ImageBuilder::InfrastructureConfiguration</code></a>.
 
@@ -177,31 +203,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>infrastructure_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, InstanceProfileName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>infrastructure_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>infrastructure_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>infrastructure_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>infrastructure_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -210,6 +242,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>infrastructure_configuration</code>.
 ```sql
 SELECT
@@ -232,6 +273,19 @@ placement
 FROM awscc.imagebuilder.infrastructure_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>infrastructure_configurations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.imagebuilder.infrastructure_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -357,6 +411,31 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.imagebuilder.infrastructure_configurations
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "InstanceTypes": instance_types,
+    "SecurityGroupIds": security_group_ids,
+    "Logging": logging,
+    "SubnetId": subnet_id,
+    "KeyPair": key_pair,
+    "TerminateInstanceOnFailure": terminate_instance_on_failure,
+    "InstanceProfileName": instance_profile_name,
+    "InstanceMetadataOptions": instance_metadata_options,
+    "SnsTopicArn": sns_topic_arn,
+    "ResourceTags": resource_tags,
+    "Tags": tags,
+    "Placement": placement
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/imagebuilder/infrastructure_configurations_list_only/index.md b/website/docs/services/imagebuilder/infrastructure_configurations_list_only/index.md
deleted file mode 100644
index be6ca2782..000000000
--- a/website/docs/services/imagebuilder/infrastructure_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: infrastructure_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - infrastructure_configurations_list_only
-  - imagebuilder
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>infrastructure_configurations</code> in a region or regions, for all properties use <a href="/services/imagebuilder/infrastructure_configurations/"><code>infrastructure_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>infrastructure_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::ImageBuilder::InfrastructureConfiguration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.imagebuilder.infrastructure_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the infrastructure configuration."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>infrastructure_configurations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.imagebuilder.infrastructure_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>infrastructure_configurations_list_only</code> resource, see <a href="/services/imagebuilder/infrastructure_configurations/#permissions"><code>infrastructure_configurations</code></a>
-
diff --git a/website/docs/services/imagebuilder/lifecycle_policies/index.md b/website/docs/services/imagebuilder/lifecycle_policies/index.md
index c0944dfce..0f17de955 100644
--- a/website/docs/services/imagebuilder/lifecycle_policies/index.md
+++ b/website/docs/services/imagebuilder/lifecycle_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>lifecycle_policy</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -216,6 +225,23 @@ Creates, updates, deletes or gets a <code>lifecycle_policy</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the lifecycle policy."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-lifecyclepolicy.html"><code>AWS::ImageBuilder::LifecyclePolicy</code></a>.
 
@@ -225,31 +251,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>lifecycle_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, ExecutionRole, ResourceType, PolicyDetails, ResourceSelection, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>lifecycle_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>lifecycle_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>lifecycle_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>lifecycle_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -258,6 +290,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>lifecycle_policy</code>.
 ```sql
 SELECT
@@ -274,6 +315,19 @@ tags
 FROM awscc.imagebuilder.lifecycle_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>lifecycle_policies</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.imagebuilder.lifecycle_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -397,6 +451,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.imagebuilder.lifecycle_policies
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Status": status,
+    "ExecutionRole": execution_role,
+    "ResourceType": resource_type,
+    "PolicyDetails": policy_details,
+    "ResourceSelection": resource_selection,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/imagebuilder/lifecycle_policies_list_only/index.md b/website/docs/services/imagebuilder/lifecycle_policies_list_only/index.md
deleted file mode 100644
index 2a9802af2..000000000
--- a/website/docs/services/imagebuilder/lifecycle_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: lifecycle_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - lifecycle_policies_list_only
-  - imagebuilder
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>lifecycle_policies</code> in a region or regions, for all properties use <a href="/services/imagebuilder/lifecycle_policies/"><code>lifecycle_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>lifecycle_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::ImageBuilder::LifecyclePolicy</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.imagebuilder.lifecycle_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the lifecycle policy."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>lifecycle_policies</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.imagebuilder.lifecycle_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>lifecycle_policies_list_only</code> resource, see <a href="/services/imagebuilder/lifecycle_policies/#permissions"><code>lifecycle_policies</code></a>
-
diff --git a/website/docs/services/imagebuilder/workflows/index.md b/website/docs/services/imagebuilder/workflows/index.md
index f93bb6af4..abfb877dc 100644
--- a/website/docs/services/imagebuilder/workflows/index.md
+++ b/website/docs/services/imagebuilder/workflows/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>workflow</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -90,6 +99,23 @@ Creates, updates, deletes or gets a <code>workflow</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the workflow."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-workflow.html"><code>AWS::ImageBuilder::Workflow</code></a>.
 
@@ -99,31 +125,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>workflows</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Type, Version, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>workflows</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>workflows</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>workflows_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>workflows</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -132,6 +164,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>workflow</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.imagebuilder.workflows
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>workflows</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.imagebuilder.workflows_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -245,6 +299,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.imagebuilder.workflows
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/imagebuilder/workflows_list_only/index.md b/website/docs/services/imagebuilder/workflows_list_only/index.md
deleted file mode 100644
index 3615afc77..000000000
--- a/website/docs/services/imagebuilder/workflows_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: workflows_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - workflows_list_only
-  - imagebuilder
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>workflows</code> in a region or regions, for all properties use <a href="/services/imagebuilder/workflows/"><code>workflows</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>workflows_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::ImageBuilder::Workflow</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.imagebuilder.workflows_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the workflow."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>workflows</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.imagebuilder.workflows_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>workflows_list_only</code> resource, see <a href="/services/imagebuilder/workflows/#permissions"><code>workflows</code></a>
-
diff --git a/website/docs/services/inspector/assessment_targets/index.md b/website/docs/services/inspector/assessment_targets/index.md
index 82613a0ee..b67854af3 100644
--- a/website/docs/services/inspector/assessment_targets/index.md
+++ b/website/docs/services/inspector/assessment_targets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>assessment_target</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets an <code>assessment_target</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttarget.html"><code>AWS::Inspector::AssessmentTarget</code></a>.
 
@@ -64,31 +90,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>assessment_targets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>assessment_targets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>assessment_targets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>assessment_targets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>assessment_targets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +129,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>assessment_target</code>.
 ```sql
 SELECT
@@ -107,6 +148,19 @@ resource_group_arn
 FROM awscc.inspector.assessment_targets
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>assessment_targets</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.inspector.assessment_targets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -173,6 +227,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.inspector.assessment_targets
+SET data__PatchDocument = string('{{ {
+    "ResourceGroupArn": resource_group_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/inspector/assessment_targets_list_only/index.md b/website/docs/services/inspector/assessment_targets_list_only/index.md
deleted file mode 100644
index 076044abe..000000000
--- a/website/docs/services/inspector/assessment_targets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: assessment_targets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - assessment_targets_list_only
-  - inspector
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>assessment_targets</code> in a region or regions, for all properties use <a href="/services/inspector/assessment_targets/"><code>assessment_targets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>assessment_targets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Inspector::AssessmentTarget</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.inspector.assessment_targets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>assessment_targets</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.inspector.assessment_targets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>assessment_targets_list_only</code> resource, see <a href="/services/inspector/assessment_targets/#permissions"><code>assessment_targets</code></a>
-
diff --git a/website/docs/services/inspector/assessment_templates/index.md b/website/docs/services/inspector/assessment_templates/index.md
index c2eb0cc84..ca95dd0d3 100644
--- a/website/docs/services/inspector/assessment_templates/index.md
+++ b/website/docs/services/inspector/assessment_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>assessment_template</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets an <code>assessment_template</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttemplate.html"><code>AWS::Inspector::AssessmentTemplate</code></a>.
 
@@ -91,26 +117,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>assessment_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AssessmentTargetArn, DurationInSeconds, RulesPackageArns, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>assessment_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>assessment_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>assessment_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +150,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>assessment_template</code>.
 ```sql
 SELECT
@@ -132,6 +172,19 @@ user_attributes_for_findings
 FROM awscc.inspector.assessment_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>assessment_templates</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.inspector.assessment_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -215,6 +268,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/inspector/assessment_templates_list_only/index.md b/website/docs/services/inspector/assessment_templates_list_only/index.md
deleted file mode 100644
index 273030445..000000000
--- a/website/docs/services/inspector/assessment_templates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: assessment_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - assessment_templates_list_only
-  - inspector
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>assessment_templates</code> in a region or regions, for all properties use <a href="/services/inspector/assessment_templates/"><code>assessment_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>assessment_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Inspector::AssessmentTemplate</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.inspector.assessment_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>assessment_templates</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.inspector.assessment_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>assessment_templates_list_only</code> resource, see <a href="/services/inspector/assessment_templates/#permissions"><code>assessment_templates</code></a>
-
diff --git a/website/docs/services/inspector/index.md b/website/docs/services/inspector/index.md
index 2538bc7ae..65e60ee90 100644
--- a/website/docs/services/inspector/index.md
+++ b/website/docs/services/inspector/index.md
@@ -20,7 +20,7 @@ The inspector service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>5</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,11 +30,9 @@ The inspector service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/inspector/assessment_targets/">assessment_targets</a><br />
-<a href="/services/inspector/assessment_targets_list_only/">assessment_targets_list_only</a><br />
 <a href="/services/inspector/assessment_templates/">assessment_templates</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/inspector/assessment_templates_list_only/">assessment_templates_list_only</a><br />
 <a href="/services/inspector/resource_groups/">resource_groups</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/inspector/resource_groups/index.md b/website/docs/services/inspector/resource_groups/index.md
index 517ed6dd6..62026efdf 100644
--- a/website/docs/services/inspector/resource_groups/index.md
+++ b/website/docs/services/inspector/resource_groups/index.md
@@ -165,6 +165,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/inspectorv2/cis_scan_configurations/index.md b/website/docs/services/inspectorv2/cis_scan_configurations/index.md
index b70c3b194..8357662e1 100644
--- a/website/docs/services/inspectorv2/cis_scan_configurations/index.md
+++ b/website/docs/services/inspectorv2/cis_scan_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cis_scan_configuration</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "scan_name",
@@ -171,6 +180,23 @@ Creates, updates, deletes or gets a <code>cis_scan_configuration</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "CIS Scan configuration unique identifier"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspectorv2-cisscanconfiguration.html"><code>AWS::InspectorV2::CisScanConfiguration</code></a>.
 
@@ -180,31 +206,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cis_scan_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ScanName, SecurityLevel, Schedule, Targets, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cis_scan_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cis_scan_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cis_scan_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cis_scan_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -213,6 +245,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cis_scan_configuration</code>.
 ```sql
 SELECT
@@ -226,6 +267,19 @@ tags
 FROM awscc.inspectorv2.cis_scan_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cis_scan_configurations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.inspectorv2.cis_scan_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -308,6 +362,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.inspectorv2.cis_scan_configurations
+SET data__PatchDocument = string('{{ {
+    "ScanName": scan_name,
+    "SecurityLevel": security_level,
+    "Schedule": schedule,
+    "Targets": targets,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/inspectorv2/cis_scan_configurations_list_only/index.md b/website/docs/services/inspectorv2/cis_scan_configurations_list_only/index.md
deleted file mode 100644
index 6221e20e3..000000000
--- a/website/docs/services/inspectorv2/cis_scan_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: cis_scan_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cis_scan_configurations_list_only
-  - inspectorv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cis_scan_configurations</code> in a region or regions, for all properties use <a href="/services/inspectorv2/cis_scan_configurations/"><code>cis_scan_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cis_scan_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>CIS Scan Configuration resource schema</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.inspectorv2.cis_scan_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "CIS Scan configuration unique identifier"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cis_scan_configurations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.inspectorv2.cis_scan_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cis_scan_configurations_list_only</code> resource, see <a href="/services/inspectorv2/cis_scan_configurations/#permissions"><code>cis_scan_configurations</code></a>
-
diff --git a/website/docs/services/inspectorv2/code_security_integrations/index.md b/website/docs/services/inspectorv2/code_security_integrations/index.md
index 2c4656cff..748fb3a88 100644
--- a/website/docs/services/inspectorv2/code_security_integrations/index.md
+++ b/website/docs/services/inspectorv2/code_security_integrations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>code_security_integration</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -145,6 +154,23 @@ Creates, updates, deletes or gets a <code>code_security_integration</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Code Security Integration ARN"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspectorv2-codesecurityintegration.html"><code>AWS::InspectorV2::CodeSecurityIntegration</code></a>.
 
@@ -154,31 +180,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>code_security_integrations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>code_security_integrations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>code_security_integrations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>code_security_integrations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>code_security_integrations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -187,6 +219,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>code_security_integration</code>.
 ```sql
 SELECT
@@ -205,6 +246,19 @@ tags
 FROM awscc.inspectorv2.code_security_integrations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>code_security_integrations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.inspectorv2.code_security_integrations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -297,6 +351,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.inspectorv2.code_security_integrations
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Type": type,
+    "UpdateIntegrationDetails": update_integration_details
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/inspectorv2/code_security_integrations_list_only/index.md b/website/docs/services/inspectorv2/code_security_integrations_list_only/index.md
deleted file mode 100644
index dcfe6383c..000000000
--- a/website/docs/services/inspectorv2/code_security_integrations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: code_security_integrations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - code_security_integrations_list_only
-  - inspectorv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>code_security_integrations</code> in a region or regions, for all properties use <a href="/services/inspectorv2/code_security_integrations/"><code>code_security_integrations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>code_security_integrations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Inspector CodeSecurityIntegration resource schema</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.inspectorv2.code_security_integrations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Code Security Integration ARN"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>code_security_integrations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.inspectorv2.code_security_integrations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>code_security_integrations_list_only</code> resource, see <a href="/services/inspectorv2/code_security_integrations/#permissions"><code>code_security_integrations</code></a>
-
diff --git a/website/docs/services/inspectorv2/code_security_scan_configurations/index.md b/website/docs/services/inspectorv2/code_security_scan_configurations/index.md
index 0a0bce779..1b567f7e2 100644
--- a/website/docs/services/inspectorv2/code_security_scan_configurations/index.md
+++ b/website/docs/services/inspectorv2/code_security_scan_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>code_security_scan_configuration</code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -106,6 +115,23 @@ Creates, updates, deletes or gets a <code>code_security_scan_configuration</code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Code Security Scan Configuration ARN"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspectorv2-codesecurityscanconfiguration.html"><code>AWS::InspectorV2::CodeSecurityScanConfiguration</code></a>.
 
@@ -115,31 +141,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>code_security_scan_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>code_security_scan_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>code_security_scan_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>code_security_scan_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>code_security_scan_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -148,6 +180,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>code_security_scan_configuration</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ tags
 FROM awscc.inspectorv2.code_security_scan_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>code_security_scan_configurations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.inspectorv2.code_security_scan_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -251,6 +305,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.inspectorv2.code_security_scan_configurations
+SET data__PatchDocument = string('{{ {
+    "Configuration": configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/inspectorv2/code_security_scan_configurations_list_only/index.md b/website/docs/services/inspectorv2/code_security_scan_configurations_list_only/index.md
deleted file mode 100644
index 33d056cdf..000000000
--- a/website/docs/services/inspectorv2/code_security_scan_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: code_security_scan_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - code_security_scan_configurations_list_only
-  - inspectorv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>code_security_scan_configurations</code> in a region or regions, for all properties use <a href="/services/inspectorv2/code_security_scan_configurations/"><code>code_security_scan_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>code_security_scan_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Inspector CodeSecurityScanConfiguration resource schema</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.inspectorv2.code_security_scan_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Code Security Scan Configuration ARN"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>code_security_scan_configurations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.inspectorv2.code_security_scan_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>code_security_scan_configurations_list_only</code> resource, see <a href="/services/inspectorv2/code_security_scan_configurations/#permissions"><code>code_security_scan_configurations</code></a>
-
diff --git a/website/docs/services/inspectorv2/filters/index.md b/website/docs/services/inspectorv2/filters/index.md
index 7f79cd3fb..34f23dd89 100644
--- a/website/docs/services/inspectorv2/filters/index.md
+++ b/website/docs/services/inspectorv2/filters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>filter</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -157,6 +166,23 @@ Creates, updates, deletes or gets a <code>filter</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Findings filter ARN."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspectorv2-filter.html"><code>AWS::InspectorV2::Filter</code></a>.
 
@@ -166,31 +192,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>filters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, FilterCriteria, FilterAction, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>filters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>filters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>filters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>filters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -199,6 +231,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>filter</code>.
 ```sql
 SELECT
@@ -212,6 +253,19 @@ tags
 FROM awscc.inspectorv2.filters
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>filters</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.inspectorv2.filters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -353,6 +407,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.inspectorv2.filters
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "FilterCriteria": filter_criteria,
+    "FilterAction": filter_action,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/inspectorv2/filters_list_only/index.md b/website/docs/services/inspectorv2/filters_list_only/index.md
deleted file mode 100644
index e4e85887e..000000000
--- a/website/docs/services/inspectorv2/filters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: filters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - filters_list_only
-  - inspectorv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>filters</code> in a region or regions, for all properties use <a href="/services/inspectorv2/filters/"><code>filters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>filters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Inspector Filter resource schema</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.inspectorv2.filters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Findings filter ARN."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>filters</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.inspectorv2.filters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>filters_list_only</code> resource, see <a href="/services/inspectorv2/filters/#permissions"><code>filters</code></a>
-
diff --git a/website/docs/services/inspectorv2/index.md b/website/docs/services/inspectorv2/index.md
index 2c84266f7..c89c8ab4d 100644
--- a/website/docs/services/inspectorv2/index.md
+++ b/website/docs/services/inspectorv2/index.md
@@ -20,7 +20,7 @@ The inspectorv2 service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The inspectorv2 service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/inspectorv2/cis_scan_configurations/">cis_scan_configurations</a><br />
-<a href="/services/inspectorv2/cis_scan_configurations_list_only/">cis_scan_configurations_list_only</a><br />
-<a href="/services/inspectorv2/code_security_integrations/">code_security_integrations</a><br />
-<a href="/services/inspectorv2/code_security_integrations_list_only/">code_security_integrations_list_only</a>
+<a href="/services/inspectorv2/code_security_integrations/">code_security_integrations</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/inspectorv2/code_security_scan_configurations/">code_security_scan_configurations</a><br />
-<a href="/services/inspectorv2/code_security_scan_configurations_list_only/">code_security_scan_configurations_list_only</a><br />
-<a href="/services/inspectorv2/filters/">filters</a><br />
-<a href="/services/inspectorv2/filters_list_only/">filters_list_only</a>
+<a href="/services/inspectorv2/filters/">filters</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/internetmonitor/index.md b/website/docs/services/internetmonitor/index.md
index f5fe87898..dda3e24c0 100644
--- a/website/docs/services/internetmonitor/index.md
+++ b/website/docs/services/internetmonitor/index.md
@@ -20,7 +20,7 @@ The internetmonitor service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The internetmonitor service documentation.
 <a href="/services/internetmonitor/monitors/">monitors</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/internetmonitor/monitors_list_only/">monitors_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/internetmonitor/monitors/index.md b/website/docs/services/internetmonitor/monitors/index.md
index 877f4dffc..4ba361cd6 100644
--- a/website/docs/services/internetmonitor/monitors/index.md
+++ b/website/docs/services/internetmonitor/monitors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>monitor</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "created_at",
@@ -190,6 +199,23 @@ Creates, updates, deletes or gets a <code>monitor</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "monitor_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-internetmonitor-monitor.html"><code>AWS::InternetMonitor::Monitor</code></a>.
 
@@ -199,31 +225,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>monitors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="MonitorName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>monitors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>monitors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>monitors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>monitors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -232,6 +264,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>monitor</code>.
 ```sql
 SELECT
@@ -256,6 +297,19 @@ health_events_config
 FROM awscc.internetmonitor.monitors
 WHERE region = 'us-east-1' AND data__Identifier = '<MonitorName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>monitors</code> in a region.
+```sql
+SELECT
+region,
+monitor_name
+FROM awscc.internetmonitor.monitors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -376,6 +430,29 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.internetmonitor.monitors
+SET data__PatchDocument = string('{{ {
+    "LinkedAccountId": linked_account_id,
+    "IncludeLinkedAccounts": include_linked_accounts,
+    "Resources": resources,
+    "ResourcesToAdd": resources_to_add,
+    "ResourcesToRemove": resources_to_remove,
+    "Status": status,
+    "Tags": tags,
+    "MaxCityNetworksToMonitor": max_city_networks_to_monitor,
+    "TrafficPercentageToMonitor": traffic_percentage_to_monitor,
+    "InternetMeasurementsLogDelivery": internet_measurements_log_delivery,
+    "HealthEventsConfig": health_events_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<MonitorName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/internetmonitor/monitors_list_only/index.md b/website/docs/services/internetmonitor/monitors_list_only/index.md
deleted file mode 100644
index 1be25b144..000000000
--- a/website/docs/services/internetmonitor/monitors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: monitors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - monitors_list_only
-  - internetmonitor
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>monitors</code> in a region or regions, for all properties use <a href="/services/internetmonitor/monitors/"><code>monitors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>monitors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a monitor, which defines the monitoring boundaries for measurements that Internet Monitor publishes information about for an application</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.internetmonitor.monitors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "monitor_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>monitors</code> in a region.
-```sql
-SELECT
-region,
-monitor_name
-FROM awscc.internetmonitor.monitors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>monitors_list_only</code> resource, see <a href="/services/internetmonitor/monitors/#permissions"><code>monitors</code></a>
-
diff --git a/website/docs/services/invoicing/index.md b/website/docs/services/invoicing/index.md
index e99746e2f..3eaf9d8ac 100644
--- a/website/docs/services/invoicing/index.md
+++ b/website/docs/services/invoicing/index.md
@@ -20,7 +20,7 @@ The invoicing service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The invoicing service documentation.
 <a href="/services/invoicing/invoice_units/">invoice_units</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/invoicing/invoice_units_list_only/">invoice_units_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/invoicing/invoice_units/index.md b/website/docs/services/invoicing/invoice_units/index.md
index a9e876574..89a25dd3f 100644
--- a/website/docs/services/invoicing/invoice_units/index.md
+++ b/website/docs/services/invoicing/invoice_units/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>invoice_unit</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "invoice_unit_arn",
@@ -99,6 +108,23 @@ Creates, updates, deletes or gets an <code>invoice_unit</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "invoice_unit_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-invoicing-invoiceunit.html"><code>AWS::Invoicing::InvoiceUnit</code></a>.
 
@@ -108,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>invoice_units</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InvoiceReceiver, Name, Rule, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>invoice_units</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>invoice_units</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>invoice_units_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>invoice_units</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>invoice_unit</code>.
 ```sql
 SELECT
@@ -156,6 +197,19 @@ resource_tags
 FROM awscc.invoicing.invoice_units
 WHERE region = 'us-east-1' AND data__Identifier = '<InvoiceUnitArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>invoice_units</code> in a region.
+```sql
+SELECT
+region,
+invoice_unit_arn
+FROM awscc.invoicing.invoice_units_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -244,6 +298,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.invoicing.invoice_units
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "TaxInheritanceDisabled": tax_inheritance_disabled,
+    "Rule": rule,
+    "ResourceTags": resource_tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InvoiceUnitArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/invoicing/invoice_units_list_only/index.md b/website/docs/services/invoicing/invoice_units_list_only/index.md
deleted file mode 100644
index 75a527d4f..000000000
--- a/website/docs/services/invoicing/invoice_units_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: invoice_units_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - invoice_units_list_only
-  - invoicing
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>invoice_units</code> in a region or regions, for all properties use <a href="/services/invoicing/invoice_units/"><code>invoice_units</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>invoice_units_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An invoice unit is a set of mutually exclusive accounts that correspond to your business entity. Invoice units allow you to separate AWS account costs and configures your invoice for each business entity.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.invoicing.invoice_units_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "invoice_unit_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>invoice_units</code> in a region.
-```sql
-SELECT
-region,
-invoice_unit_arn
-FROM awscc.invoicing.invoice_units_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>invoice_units_list_only</code> resource, see <a href="/services/invoicing/invoice_units/#permissions"><code>invoice_units</code></a>
-
diff --git a/website/docs/services/iot/account_audit_configurations/index.md b/website/docs/services/iot/account_audit_configurations/index.md
index 5f947b8ea..f630fe62b 100644
--- a/website/docs/services/iot/account_audit_configurations/index.md
+++ b/website/docs/services/iot/account_audit_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>account_audit_configuration</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "account_id",
@@ -146,6 +155,23 @@ Creates, updates, deletes or gets an <code>account_audit_configuration</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "account_id",
+    "type": "string",
+    "description": "Your 12-digit account ID (used as the primary identifier for the CloudFormation resource)."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-accountauditconfiguration.html"><code>AWS::IoT::AccountAuditConfiguration</code></a>.
 
@@ -155,31 +181,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>account_audit_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AccountId, AuditCheckConfigurations, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>account_audit_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>account_audit_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>account_audit_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>account_audit_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -188,6 +220,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>account_audit_configuration</code>.
 ```sql
 SELECT
@@ -199,6 +240,19 @@ role_arn
 FROM awscc.iot.account_audit_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<AccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>account_audit_configurations</code> in a region.
+```sql
+SELECT
+region,
+account_id
+FROM awscc.iot.account_audit_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -303,6 +357,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.account_audit_configurations
+SET data__PatchDocument = string('{{ {
+    "AuditCheckConfigurations": audit_check_configurations,
+    "AuditNotificationTargetConfigurations": audit_notification_target_configurations,
+    "RoleArn": role_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/account_audit_configurations_list_only/index.md b/website/docs/services/iot/account_audit_configurations_list_only/index.md
deleted file mode 100644
index a835dbbf4..000000000
--- a/website/docs/services/iot/account_audit_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: account_audit_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - account_audit_configurations_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>account_audit_configurations</code> in a region or regions, for all properties use <a href="/services/iot/account_audit_configurations/"><code>account_audit_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>account_audit_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Configures the Device Defender audit settings for this account. Settings include how audit notifications are sent and which audit checks are enabled or disabled.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.account_audit_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "account_id",
-    "type": "string",
-    "description": "Your 12-digit account ID (used as the primary identifier for the CloudFormation resource)."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>account_audit_configurations</code> in a region.
-```sql
-SELECT
-region,
-account_id
-FROM awscc.iot.account_audit_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>account_audit_configurations_list_only</code> resource, see <a href="/services/iot/account_audit_configurations/#permissions"><code>account_audit_configurations</code></a>
-
diff --git a/website/docs/services/iot/authorizers/index.md b/website/docs/services/iot/authorizers/index.md
index 77b87eeba..8b010ac93 100644
--- a/website/docs/services/iot/authorizers/index.md
+++ b/website/docs/services/iot/authorizers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>authorizer</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "authorizer_function_arn",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets an <code>authorizer</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "authorizer_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-authorizer.html"><code>AWS::IoT::Authorizer</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>authorizers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AuthorizerFunctionArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>authorizers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>authorizers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>authorizers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>authorizers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>authorizer</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ tags
 FROM awscc.iot.authorizers
 WHERE region = 'us-east-1' AND data__Identifier = '<AuthorizerName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>authorizers</code> in a region.
+```sql
+SELECT
+region,
+authorizer_name
+FROM awscc.iot.authorizers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -245,6 +299,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.authorizers
+SET data__PatchDocument = string('{{ {
+    "AuthorizerFunctionArn": authorizer_function_arn,
+    "Status": status,
+    "TokenKeyName": token_key_name,
+    "TokenSigningPublicKeys": token_signing_public_keys,
+    "EnableCachingForHttp": enable_caching_for_http,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AuthorizerName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/authorizers_list_only/index.md b/website/docs/services/iot/authorizers_list_only/index.md
deleted file mode 100644
index 68ce5f482..000000000
--- a/website/docs/services/iot/authorizers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: authorizers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - authorizers_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>authorizers</code> in a region or regions, for all properties use <a href="/services/iot/authorizers/"><code>authorizers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>authorizers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates an authorizer.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.authorizers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "authorizer_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>authorizers</code> in a region.
-```sql
-SELECT
-region,
-authorizer_name
-FROM awscc.iot.authorizers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>authorizers_list_only</code> resource, see <a href="/services/iot/authorizers/#permissions"><code>authorizers</code></a>
-
diff --git a/website/docs/services/iot/billing_groups/index.md b/website/docs/services/iot/billing_groups/index.md
index baeb3e95b..66438933c 100644
--- a/website/docs/services/iot/billing_groups/index.md
+++ b/website/docs/services/iot/billing_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>billing_group</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -84,6 +93,23 @@ Creates, updates, deletes or gets a <code>billing_group</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "billing_group_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-billinggroup.html"><code>AWS::IoT::BillingGroup</code></a>.
 
@@ -93,31 +119,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>billing_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>billing_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>billing_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>billing_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>billing_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -126,6 +158,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>billing_group</code>.
 ```sql
 SELECT
@@ -138,6 +179,19 @@ billing_group_properties
 FROM awscc.iot.billing_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<BillingGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>billing_groups</code> in a region.
+```sql
+SELECT
+region,
+billing_group_name
+FROM awscc.iot.billing_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -213,6 +267,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.billing_groups
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "BillingGroupProperties": billing_group_properties
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<BillingGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/billing_groups_list_only/index.md b/website/docs/services/iot/billing_groups_list_only/index.md
deleted file mode 100644
index 3a0f0e8f0..000000000
--- a/website/docs/services/iot/billing_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: billing_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - billing_groups_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>billing_groups</code> in a region or regions, for all properties use <a href="/services/iot/billing_groups/"><code>billing_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>billing_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IoT::BillingGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.billing_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "billing_group_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>billing_groups</code> in a region.
-```sql
-SELECT
-region,
-billing_group_name
-FROM awscc.iot.billing_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>billing_groups_list_only</code> resource, see <a href="/services/iot/billing_groups/#permissions"><code>billing_groups</code></a>
-
diff --git a/website/docs/services/iot/ca_certificates/index.md b/website/docs/services/iot/ca_certificates/index.md
index df956a2d4..ee51b1c85 100644
--- a/website/docs/services/iot/ca_certificates/index.md
+++ b/website/docs/services/iot/ca_certificates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>ca_certificate</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ca_certificate_pem",
@@ -119,6 +128,23 @@ Creates, updates, deletes or gets a <code>ca_certificate</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-cacertificate.html"><code>AWS::IoT::CACertificate</code></a>.
 
@@ -128,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ca_certificates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CACertificatePem, Status, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ca_certificates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ca_certificates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ca_certificates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ca_certificates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ca_certificate</code>.
 ```sql
 SELECT
@@ -178,6 +219,19 @@ tags
 FROM awscc.iot.ca_certificates
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ca_certificates</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.iot.ca_certificates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -273,6 +327,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.ca_certificates
+SET data__PatchDocument = string('{{ {
+    "Status": status,
+    "AutoRegistrationStatus": auto_registration_status,
+    "RemoveAutoRegistration": remove_auto_registration,
+    "RegistrationConfig": registration_config,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/ca_certificates_list_only/index.md b/website/docs/services/iot/ca_certificates_list_only/index.md
deleted file mode 100644
index c9d2eb3a5..000000000
--- a/website/docs/services/iot/ca_certificates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: ca_certificates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ca_certificates_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ca_certificates</code> in a region or regions, for all properties use <a href="/services/iot/ca_certificates/"><code>ca_certificates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ca_certificates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Registers a CA Certificate in IoT.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.ca_certificates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ca_certificates</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.iot.ca_certificates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ca_certificates_list_only</code> resource, see <a href="/services/iot/ca_certificates/#permissions"><code>ca_certificates</code></a>
-
diff --git a/website/docs/services/iot/certificate_providers/index.md b/website/docs/services/iot/certificate_providers/index.md
index 4b7ddfc9c..6c2f19efd 100644
--- a/website/docs/services/iot/certificate_providers/index.md
+++ b/website/docs/services/iot/certificate_providers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>certificate_provider</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "certificate_provider_name",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>certificate_provider</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "certificate_provider_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-certificateprovider.html"><code>AWS::IoT::CertificateProvider</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>certificate_providers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LambdaFunctionArn, AccountDefaultForOperations, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>certificate_providers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>certificate_providers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>certificate_providers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>certificate_providers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>certificate_provider</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ arn
 FROM awscc.iot.certificate_providers
 WHERE region = 'us-east-1' AND data__Identifier = '<CertificateProviderName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>certificate_providers</code> in a region.
+```sql
+SELECT
+region,
+certificate_provider_name
+FROM awscc.iot.certificate_providers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -208,6 +262,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.certificate_providers
+SET data__PatchDocument = string('{{ {
+    "LambdaFunctionArn": lambda_function_arn,
+    "AccountDefaultForOperations": account_default_for_operations,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CertificateProviderName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/certificate_providers_list_only/index.md b/website/docs/services/iot/certificate_providers_list_only/index.md
deleted file mode 100644
index 08f5b18e4..000000000
--- a/website/docs/services/iot/certificate_providers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: certificate_providers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - certificate_providers_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>certificate_providers</code> in a region or regions, for all properties use <a href="/services/iot/certificate_providers/"><code>certificate_providers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>certificate_providers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Use the AWS::IoT::CertificateProvider resource to declare an AWS IoT Certificate Provider.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.certificate_providers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "certificate_provider_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>certificate_providers</code> in a region.
-```sql
-SELECT
-region,
-certificate_provider_name
-FROM awscc.iot.certificate_providers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>certificate_providers_list_only</code> resource, see <a href="/services/iot/certificate_providers/#permissions"><code>certificate_providers</code></a>
-
diff --git a/website/docs/services/iot/certificates/index.md b/website/docs/services/iot/certificates/index.md
index 442b84a74..cba0c1fb6 100644
--- a/website/docs/services/iot/certificates/index.md
+++ b/website/docs/services/iot/certificates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>certificate</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ca_certificate_pem",
@@ -75,6 +84,23 @@ Creates, updates, deletes or gets a <code>certificate</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-certificate.html"><code>AWS::IoT::Certificate</code></a>.
 
@@ -84,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>certificates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Status, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>certificates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>certificates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>certificates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>certificates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>certificate</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ arn
 FROM awscc.iot.certificates
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>certificates</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.iot.certificates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -207,6 +261,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.certificates
+SET data__PatchDocument = string('{{ {
+    "Status": status
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/certificates_list_only/index.md b/website/docs/services/iot/certificates_list_only/index.md
deleted file mode 100644
index b5758e263..000000000
--- a/website/docs/services/iot/certificates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: certificates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - certificates_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>certificates</code> in a region or regions, for all properties use <a href="/services/iot/certificates/"><code>certificates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>certificates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Use the AWS::IoT::Certificate resource to declare an AWS IoT X.509 certificate.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.certificates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>certificates</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.iot.certificates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>certificates_list_only</code> resource, see <a href="/services/iot/certificates/#permissions"><code>certificates</code></a>
-
diff --git a/website/docs/services/iot/commands/index.md b/website/docs/services/iot/commands/index.md
index 9d8f686a7..283716159 100644
--- a/website/docs/services/iot/commands/index.md
+++ b/website/docs/services/iot/commands/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>command</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "command_arn",
@@ -183,6 +192,23 @@ Creates, updates, deletes or gets a <code>command</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "command_id",
+    "type": "string",
+    "description": "The unique identifier for the command."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-command.html"><code>AWS::IoT::Command</code></a>.
 
@@ -192,31 +218,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>commands</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CommandId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>commands</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>commands</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>commands_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>commands</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -225,6 +257,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>command</code>.
 ```sql
 SELECT
@@ -245,6 +286,19 @@ tags
 FROM awscc.iot.commands
 WHERE region = 'us-east-1' AND data__Identifier = '<CommandId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>commands</code> in a region.
+```sql
+SELECT
+region,
+command_id
+FROM awscc.iot.commands_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -364,6 +418,29 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.commands
+SET data__PatchDocument = string('{{ {
+    "CreatedAt": created_at,
+    "Deprecated": deprecated,
+    "Description": description,
+    "DisplayName": display_name,
+    "LastUpdatedAt": last_updated_at,
+    "MandatoryParameters": mandatory_parameters,
+    "Namespace": namespace,
+    "RoleArn": role_arn,
+    "Payload": payload,
+    "PendingDeletion": pending_deletion,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CommandId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/commands_list_only/index.md b/website/docs/services/iot/commands_list_only/index.md
deleted file mode 100644
index e06189405..000000000
--- a/website/docs/services/iot/commands_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: commands_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - commands_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>commands</code> in a region or regions, for all properties use <a href="/services/iot/commands/"><code>commands</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>commands_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents the resource definition of AWS IoT Command.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.commands_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "command_id",
-    "type": "string",
-    "description": "The unique identifier for the command."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>commands</code> in a region.
-```sql
-SELECT
-region,
-command_id
-FROM awscc.iot.commands_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>commands_list_only</code> resource, see <a href="/services/iot/commands/#permissions"><code>commands</code></a>
-
diff --git a/website/docs/services/iot/custom_metrics/index.md b/website/docs/services/iot/custom_metrics/index.md
index 86a8af72c..82959962a 100644
--- a/website/docs/services/iot/custom_metrics/index.md
+++ b/website/docs/services/iot/custom_metrics/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>custom_metric</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "metric_name",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>custom_metric</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "metric_name",
+    "type": "string",
+    "description": "The name of the custom metric. This will be used in the metric report submitted from the device/thing. Shouldn't begin with aws: . Cannot be updated once defined."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-custommetric.html"><code>AWS::IoT::CustomMetric</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>custom_metrics</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="MetricType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>custom_metrics</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>custom_metrics</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>custom_metrics_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>custom_metrics</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>custom_metric</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.iot.custom_metrics
 WHERE region = 'us-east-1' AND data__Identifier = '<MetricName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>custom_metrics</code> in a region.
+```sql
+SELECT
+region,
+metric_name
+FROM awscc.iot.custom_metrics_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +259,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.custom_metrics
+SET data__PatchDocument = string('{{ {
+    "DisplayName": display_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<MetricName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/custom_metrics_list_only/index.md b/website/docs/services/iot/custom_metrics_list_only/index.md
deleted file mode 100644
index ca536d51e..000000000
--- a/website/docs/services/iot/custom_metrics_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: custom_metrics_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - custom_metrics_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>custom_metrics</code> in a region or regions, for all properties use <a href="/services/iot/custom_metrics/"><code>custom_metrics</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>custom_metrics_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A custom metric published by your devices to Device Defender.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.custom_metrics_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "metric_name",
-    "type": "string",
-    "description": "The name of the custom metric. This will be used in the metric report submitted from the device/thing. Shouldn't begin with aws: . Cannot be updated once defined."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>custom_metrics</code> in a region.
-```sql
-SELECT
-region,
-metric_name
-FROM awscc.iot.custom_metrics_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>custom_metrics_list_only</code> resource, see <a href="/services/iot/custom_metrics/#permissions"><code>custom_metrics</code></a>
-
diff --git a/website/docs/services/iot/dimensions/index.md b/website/docs/services/iot/dimensions/index.md
index 7c1636ab9..4c0f7eade 100644
--- a/website/docs/services/iot/dimensions/index.md
+++ b/website/docs/services/iot/dimensions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>dimension</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>dimension</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "A unique identifier for the dimension."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-dimension.html"><code>AWS::IoT::Dimension</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>dimensions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, StringValues, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>dimensions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>dimensions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>dimensions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>dimensions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dimension</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ arn
 FROM awscc.iot.dimensions
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>dimensions</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.iot.dimensions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -208,6 +262,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.dimensions
+SET data__PatchDocument = string('{{ {
+    "StringValues": string_values,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/dimensions_list_only/index.md b/website/docs/services/iot/dimensions_list_only/index.md
deleted file mode 100644
index 4947ed7a4..000000000
--- a/website/docs/services/iot/dimensions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: dimensions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - dimensions_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>dimensions</code> in a region or regions, for all properties use <a href="/services/iot/dimensions/"><code>dimensions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>dimensions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A dimension can be used to limit the scope of a metric used in a security profile for AWS IoT Device Defender.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.dimensions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "A unique identifier for the dimension."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>dimensions</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.iot.dimensions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>dimensions_list_only</code> resource, see <a href="/services/iot/dimensions/#permissions"><code>dimensions</code></a>
-
diff --git a/website/docs/services/iot/domain_configurations/index.md b/website/docs/services/iot/domain_configurations/index.md
index 0d2d7a610..58c47a75a 100644
--- a/website/docs/services/iot/domain_configurations/index.md
+++ b/website/docs/services/iot/domain_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>domain_configuration</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain_configuration_name",
@@ -192,6 +201,23 @@ Creates, updates, deletes or gets a <code>domain_configuration</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_configuration_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html"><code>AWS::IoT::DomainConfiguration</code></a>.
 
@@ -201,31 +227,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>domain_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>domain_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>domain_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>domain_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>domain_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -234,6 +266,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>domain_configuration</code>.
 ```sql
 SELECT
@@ -257,6 +298,19 @@ tags
 FROM awscc.iot.domain_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainConfigurationName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>domain_configurations</code> in a region.
+```sql
+SELECT
+region,
+domain_configuration_name
+FROM awscc.iot.domain_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -375,6 +429,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.domain_configurations
+SET data__PatchDocument = string('{{ {
+    "AuthorizerConfig": authorizer_config,
+    "DomainConfigurationStatus": domain_configuration_status,
+    "ServerCertificateConfig": server_certificate_config,
+    "TlsConfig": tls_config,
+    "AuthenticationType": authentication_type,
+    "ApplicationProtocol": application_protocol,
+    "ClientCertificateConfig": client_certificate_config,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainConfigurationName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/domain_configurations_list_only/index.md b/website/docs/services/iot/domain_configurations_list_only/index.md
deleted file mode 100644
index 3d96253f5..000000000
--- a/website/docs/services/iot/domain_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: domain_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - domain_configurations_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>domain_configurations</code> in a region or regions, for all properties use <a href="/services/iot/domain_configurations/"><code>domain_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>domain_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Create and manage a Domain Configuration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.domain_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_configuration_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>domain_configurations</code> in a region.
-```sql
-SELECT
-region,
-domain_configuration_name
-FROM awscc.iot.domain_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>domain_configurations_list_only</code> resource, see <a href="/services/iot/domain_configurations/#permissions"><code>domain_configurations</code></a>
-
diff --git a/website/docs/services/iot/encryption_configurations/index.md b/website/docs/services/iot/encryption_configurations/index.md
index 50c7bc450..6d7af086e 100644
--- a/website/docs/services/iot/encryption_configurations/index.md
+++ b/website/docs/services/iot/encryption_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>encryption_configuration</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "account_id",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets an <code>encryption_configuration</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "account_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-encryptionconfiguration.html"><code>AWS::IoT::EncryptionConfiguration</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>encryption_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EncryptionType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>encryption_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>encryption_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>encryption_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>encryption_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>encryption_configuration</code>.
 ```sql
 SELECT
@@ -142,6 +183,19 @@ last_modified_date
 FROM awscc.iot.encryption_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<AccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>encryption_configurations</code> in a region.
+```sql
+SELECT
+region,
+account_id
+FROM awscc.iot.encryption_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -210,6 +264,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.encryption_configurations
+SET data__PatchDocument = string('{{ {
+    "EncryptionType": encryption_type,
+    "KmsAccessRoleArn": kms_access_role_arn,
+    "KmsKeyArn": kms_key_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/encryption_configurations_list_only/index.md b/website/docs/services/iot/encryption_configurations_list_only/index.md
deleted file mode 100644
index 3631430e2..000000000
--- a/website/docs/services/iot/encryption_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: encryption_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - encryption_configurations_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>encryption_configurations</code> in a region or regions, for all properties use <a href="/services/iot/encryption_configurations/"><code>encryption_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>encryption_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IoT::EncryptionConfiguration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.encryption_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "account_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>encryption_configurations</code> in a region.
-```sql
-SELECT
-region,
-account_id
-FROM awscc.iot.encryption_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>encryption_configurations_list_only</code> resource, see <a href="/services/iot/encryption_configurations/#permissions"><code>encryption_configurations</code></a>
-
diff --git a/website/docs/services/iot/fleet_metrics/index.md b/website/docs/services/iot/fleet_metrics/index.md
index f3d8fdc57..680d7ff3b 100644
--- a/website/docs/services/iot/fleet_metrics/index.md
+++ b/website/docs/services/iot/fleet_metrics/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>fleet_metric</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "metric_name",
@@ -129,6 +138,23 @@ Creates, updates, deletes or gets a <code>fleet_metric</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "metric_name",
+    "type": "string",
+    "description": "The name of the fleet metric"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-fleetmetric.html"><code>AWS::IoT::FleetMetric</code></a>.
 
@@ -138,31 +164,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>fleet_metrics</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="MetricName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>fleet_metrics</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>fleet_metrics</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>fleet_metrics_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>fleet_metrics</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -171,6 +203,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>fleet_metric</code>.
 ```sql
 SELECT
@@ -192,6 +233,19 @@ tags
 FROM awscc.iot.fleet_metrics
 WHERE region = 'us-east-1' AND data__Identifier = '<MetricName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>fleet_metrics</code> in a region.
+```sql
+SELECT
+region,
+metric_name
+FROM awscc.iot.fleet_metrics_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -293,6 +347,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.fleet_metrics
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "QueryString": query_string,
+    "Period": period,
+    "AggregationField": aggregation_field,
+    "QueryVersion": query_version,
+    "IndexName": index_name,
+    "Unit": unit,
+    "AggregationType": aggregation_type,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<MetricName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/fleet_metrics_list_only/index.md b/website/docs/services/iot/fleet_metrics_list_only/index.md
deleted file mode 100644
index 428b77e10..000000000
--- a/website/docs/services/iot/fleet_metrics_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: fleet_metrics_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - fleet_metrics_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>fleet_metrics</code> in a region or regions, for all properties use <a href="/services/iot/fleet_metrics/"><code>fleet_metrics</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>fleet_metrics_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An aggregated metric of certain devices in your fleet</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.fleet_metrics_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "metric_name",
-    "type": "string",
-    "description": "The name of the fleet metric"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>fleet_metrics</code> in a region.
-```sql
-SELECT
-region,
-metric_name
-FROM awscc.iot.fleet_metrics_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>fleet_metrics_list_only</code> resource, see <a href="/services/iot/fleet_metrics/#permissions"><code>fleet_metrics</code></a>
-
diff --git a/website/docs/services/iot/index.md b/website/docs/services/iot/index.md
index 5ea5e9865..bda8d6be9 100644
--- a/website/docs/services/iot/index.md
+++ b/website/docs/services/iot/index.md
@@ -20,7 +20,7 @@ The iot service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>56</b></span><br />
+<span>total resources:&nbsp;<b>28</b></span><br />
 </div>
 </div>
 
@@ -30,62 +30,34 @@ The iot service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/iot/account_audit_configurations/">account_audit_configurations</a><br />
-<a href="/services/iot/account_audit_configurations_list_only/">account_audit_configurations_list_only</a><br />
 <a href="/services/iot/authorizers/">authorizers</a><br />
-<a href="/services/iot/authorizers_list_only/">authorizers_list_only</a><br />
 <a href="/services/iot/billing_groups/">billing_groups</a><br />
-<a href="/services/iot/billing_groups_list_only/">billing_groups_list_only</a><br />
 <a href="/services/iot/ca_certificates/">ca_certificates</a><br />
-<a href="/services/iot/ca_certificates_list_only/">ca_certificates_list_only</a><br />
 <a href="/services/iot/certificate_providers/">certificate_providers</a><br />
-<a href="/services/iot/certificate_providers_list_only/">certificate_providers_list_only</a><br />
 <a href="/services/iot/certificates/">certificates</a><br />
-<a href="/services/iot/certificates_list_only/">certificates_list_only</a><br />
 <a href="/services/iot/commands/">commands</a><br />
-<a href="/services/iot/commands_list_only/">commands_list_only</a><br />
 <a href="/services/iot/custom_metrics/">custom_metrics</a><br />
-<a href="/services/iot/custom_metrics_list_only/">custom_metrics_list_only</a><br />
 <a href="/services/iot/dimensions/">dimensions</a><br />
-<a href="/services/iot/dimensions_list_only/">dimensions_list_only</a><br />
 <a href="/services/iot/domain_configurations/">domain_configurations</a><br />
-<a href="/services/iot/domain_configurations_list_only/">domain_configurations_list_only</a><br />
 <a href="/services/iot/encryption_configurations/">encryption_configurations</a><br />
-<a href="/services/iot/encryption_configurations_list_only/">encryption_configurations_list_only</a><br />
 <a href="/services/iot/fleet_metrics/">fleet_metrics</a><br />
-<a href="/services/iot/fleet_metrics_list_only/">fleet_metrics_list_only</a><br />
 <a href="/services/iot/job_templates/">job_templates</a><br />
-<a href="/services/iot/job_templates_list_only/">job_templates_list_only</a><br />
-<a href="/services/iot/loggings/">loggings</a><br />
-<a href="/services/iot/loggings_list_only/">loggings_list_only</a>
+<a href="/services/iot/loggings/">loggings</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/iot/mitigation_actions/">mitigation_actions</a><br />
-<a href="/services/iot/mitigation_actions_list_only/">mitigation_actions_list_only</a><br />
 <a href="/services/iot/policies/">policies</a><br />
-<a href="/services/iot/policies_list_only/">policies_list_only</a><br />
 <a href="/services/iot/provisioning_templates/">provisioning_templates</a><br />
-<a href="/services/iot/provisioning_templates_list_only/">provisioning_templates_list_only</a><br />
 <a href="/services/iot/resource_specific_loggings/">resource_specific_loggings</a><br />
-<a href="/services/iot/resource_specific_loggings_list_only/">resource_specific_loggings_list_only</a><br />
 <a href="/services/iot/role_aliases/">role_aliases</a><br />
-<a href="/services/iot/role_aliases_list_only/">role_aliases_list_only</a><br />
 <a href="/services/iot/scheduled_audits/">scheduled_audits</a><br />
-<a href="/services/iot/scheduled_audits_list_only/">scheduled_audits_list_only</a><br />
 <a href="/services/iot/security_profiles/">security_profiles</a><br />
-<a href="/services/iot/security_profiles_list_only/">security_profiles_list_only</a><br />
 <a href="/services/iot/software_package_versions/">software_package_versions</a><br />
-<a href="/services/iot/software_package_versions_list_only/">software_package_versions_list_only</a><br />
 <a href="/services/iot/software_packages/">software_packages</a><br />
-<a href="/services/iot/software_packages_list_only/">software_packages_list_only</a><br />
 <a href="/services/iot/thing_groups/">thing_groups</a><br />
-<a href="/services/iot/thing_groups_list_only/">thing_groups_list_only</a><br />
 <a href="/services/iot/thing_types/">thing_types</a><br />
-<a href="/services/iot/thing_types_list_only/">thing_types_list_only</a><br />
 <a href="/services/iot/things/">things</a><br />
-<a href="/services/iot/things_list_only/">things_list_only</a><br />
 <a href="/services/iot/topic_rule_destinations/">topic_rule_destinations</a><br />
-<a href="/services/iot/topic_rule_destinations_list_only/">topic_rule_destinations_list_only</a><br />
-<a href="/services/iot/topic_rules/">topic_rules</a><br />
-<a href="/services/iot/topic_rules_list_only/">topic_rules_list_only</a>
+<a href="/services/iot/topic_rules/">topic_rules</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/iot/job_templates/index.md b/website/docs/services/iot/job_templates/index.md
index 9ae237b6a..2a67a90a6 100644
--- a/website/docs/services/iot/job_templates/index.md
+++ b/website/docs/services/iot/job_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>job_template</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -354,6 +363,23 @@ Creates, updates, deletes or gets a <code>job_template</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "job_template_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-jobtemplate.html"><code>AWS::IoT::JobTemplate</code></a>.
 
@@ -363,26 +389,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>job_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="JobTemplateId, Description, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>job_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>job_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>job_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -391,6 +422,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>job_template</code>.
 ```sql
 SELECT
@@ -412,6 +452,19 @@ tags
 FROM awscc.iot.job_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<JobTemplateId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>job_templates</code> in a region.
+```sql
+SELECT
+region,
+job_template_id
+FROM awscc.iot.job_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -693,6 +746,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/job_templates_list_only/index.md b/website/docs/services/iot/job_templates_list_only/index.md
deleted file mode 100644
index 701ccca33..000000000
--- a/website/docs/services/iot/job_templates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: job_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - job_templates_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>job_templates</code> in a region or regions, for all properties use <a href="/services/iot/job_templates/"><code>job_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>job_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IoT::JobTemplate. Job templates enable you to preconfigure jobs so that you can deploy them to multiple sets of target devices.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.job_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "job_template_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>job_templates</code> in a region.
-```sql
-SELECT
-region,
-job_template_id
-FROM awscc.iot.job_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>job_templates_list_only</code> resource, see <a href="/services/iot/job_templates/#permissions"><code>job_templates</code></a>
-
diff --git a/website/docs/services/iot/loggings/index.md b/website/docs/services/iot/loggings/index.md
index 873b01953..a5ec47666 100644
--- a/website/docs/services/iot/loggings/index.md
+++ b/website/docs/services/iot/loggings/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>logging</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "account_id",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets a <code>logging</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "account_id",
+    "type": "string",
+    "description": "Your 12-digit account ID (used as the primary identifier for the CloudFormation resource)."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-logging.html"><code>AWS::IoT::Logging</code></a>.
 
@@ -64,31 +90,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>loggings</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AccountId, RoleArn, DefaultLogLevel, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>loggings</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>loggings</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>loggings_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>loggings</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +129,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>logging</code>.
 ```sql
 SELECT
@@ -107,6 +148,19 @@ default_log_level
 FROM awscc.iot.loggings
 WHERE region = 'us-east-1' AND data__Identifier = '<AccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>loggings</code> in a region.
+```sql
+SELECT
+region,
+account_id
+FROM awscc.iot.loggings_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -179,6 +233,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.loggings
+SET data__PatchDocument = string('{{ {
+    "RoleArn": role_arn,
+    "DefaultLogLevel": default_log_level
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/loggings_list_only/index.md b/website/docs/services/iot/loggings_list_only/index.md
deleted file mode 100644
index b36e4ebf6..000000000
--- a/website/docs/services/iot/loggings_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: loggings_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - loggings_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>loggings</code> in a region or regions, for all properties use <a href="/services/iot/loggings/"><code>loggings</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>loggings_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Logging Options enable you to configure your IoT V2 logging role and default logging level so that you can monitor progress events logs as it passes from your devices through Iot core service.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.loggings_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "account_id",
-    "type": "string",
-    "description": "Your 12-digit account ID (used as the primary identifier for the CloudFormation resource)."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>loggings</code> in a region.
-```sql
-SELECT
-region,
-account_id
-FROM awscc.iot.loggings_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>loggings_list_only</code> resource, see <a href="/services/iot/loggings/#permissions"><code>loggings</code></a>
-
diff --git a/website/docs/services/iot/mitigation_actions/index.md b/website/docs/services/iot/mitigation_actions/index.md
index e8b44db13..4c3993b9d 100644
--- a/website/docs/services/iot/mitigation_actions/index.md
+++ b/website/docs/services/iot/mitigation_actions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>mitigation_action</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "action_name",
@@ -166,6 +175,23 @@ Creates, updates, deletes or gets a <code>mitigation_action</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "action_name",
+    "type": "string",
+    "description": "A unique identifier for the mitigation action."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-mitigationaction.html"><code>AWS::IoT::MitigationAction</code></a>.
 
@@ -175,31 +201,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>mitigation_actions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RoleArn, ActionParams, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>mitigation_actions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>mitigation_actions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>mitigation_actions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>mitigation_actions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -208,6 +240,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>mitigation_action</code>.
 ```sql
 SELECT
@@ -221,6 +262,19 @@ mitigation_action_id
 FROM awscc.iot.mitigation_actions
 WHERE region = 'us-east-1' AND data__Identifier = '<ActionName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>mitigation_actions</code> in a region.
+```sql
+SELECT
+region,
+action_name
+FROM awscc.iot.mitigation_actions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -312,6 +366,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.mitigation_actions
+SET data__PatchDocument = string('{{ {
+    "RoleArn": role_arn,
+    "Tags": tags,
+    "ActionParams": action_params
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ActionName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/mitigation_actions_list_only/index.md b/website/docs/services/iot/mitigation_actions_list_only/index.md
deleted file mode 100644
index b03d60b67..000000000
--- a/website/docs/services/iot/mitigation_actions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: mitigation_actions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - mitigation_actions_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>mitigation_actions</code> in a region or regions, for all properties use <a href="/services/iot/mitigation_actions/"><code>mitigation_actions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>mitigation_actions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Mitigation actions can be used to take actions to mitigate issues that were found in an Audit finding or Detect violation.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.mitigation_actions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "action_name",
-    "type": "string",
-    "description": "A unique identifier for the mitigation action."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>mitigation_actions</code> in a region.
-```sql
-SELECT
-region,
-action_name
-FROM awscc.iot.mitigation_actions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>mitigation_actions_list_only</code> resource, see <a href="/services/iot/mitigation_actions/#permissions"><code>mitigation_actions</code></a>
-
diff --git a/website/docs/services/iot/policies/index.md b/website/docs/services/iot/policies/index.md
index 81b5670d8..3a6aaf62f 100644
--- a/website/docs/services/iot/policies/index.md
+++ b/website/docs/services/iot/policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>policy</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>policy</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-policy.html"><code>AWS::IoT::Policy</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PolicyDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>policy</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.iot.policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>policies</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.iot.policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -201,6 +255,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.policies
+SET data__PatchDocument = string('{{ {
+    "PolicyDocument": policy_document,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/policies_list_only/index.md b/website/docs/services/iot/policies_list_only/index.md
deleted file mode 100644
index dc5780194..000000000
--- a/website/docs/services/iot/policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - policies_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>policies</code> in a region or regions, for all properties use <a href="/services/iot/policies/"><code>policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IoT::Policy</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>policies</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.iot.policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>policies_list_only</code> resource, see <a href="/services/iot/policies/#permissions"><code>policies</code></a>
-
diff --git a/website/docs/services/iot/provisioning_templates/index.md b/website/docs/services/iot/provisioning_templates/index.md
index e437bf85a..063d7b6fc 100644
--- a/website/docs/services/iot/provisioning_templates/index.md
+++ b/website/docs/services/iot/provisioning_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>provisioning_template</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "template_arn",
@@ -109,6 +118,23 @@ Creates, updates, deletes or gets a <code>provisioning_template</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "template_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-provisioningtemplate.html"><code>AWS::IoT::ProvisioningTemplate</code></a>.
 
@@ -118,31 +144,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>provisioning_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ProvisioningRoleArn, TemplateBody, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>provisioning_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>provisioning_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>provisioning_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>provisioning_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +183,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>provisioning_template</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ tags
 FROM awscc.iot.provisioning_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<TemplateName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>provisioning_templates</code> in a region.
+```sql
+SELECT
+region,
+template_name
+FROM awscc.iot.provisioning_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -261,6 +315,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.provisioning_templates
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Enabled": enabled,
+    "ProvisioningRoleArn": provisioning_role_arn,
+    "TemplateBody": template_body,
+    "PreProvisioningHook": pre_provisioning_hook,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TemplateName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/provisioning_templates_list_only/index.md b/website/docs/services/iot/provisioning_templates_list_only/index.md
deleted file mode 100644
index 95e0bdfaf..000000000
--- a/website/docs/services/iot/provisioning_templates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: provisioning_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - provisioning_templates_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>provisioning_templates</code> in a region or regions, for all properties use <a href="/services/iot/provisioning_templates/"><code>provisioning_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>provisioning_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a fleet provisioning template.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.provisioning_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "template_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>provisioning_templates</code> in a region.
-```sql
-SELECT
-region,
-template_name
-FROM awscc.iot.provisioning_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>provisioning_templates_list_only</code> resource, see <a href="/services/iot/provisioning_templates/#permissions"><code>provisioning_templates</code></a>
-
diff --git a/website/docs/services/iot/resource_specific_loggings/index.md b/website/docs/services/iot/resource_specific_loggings/index.md
index 719cffcf7..b534564df 100644
--- a/website/docs/services/iot/resource_specific_loggings/index.md
+++ b/website/docs/services/iot/resource_specific_loggings/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_specific_logging</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "target_type",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets a <code>resource_specific_logging</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "target_id",
+    "type": "string",
+    "description": "Unique Id for a Target (TargetType:TargetName), this will be internally built to serve as primary identifier for a log target."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-resourcespecificlogging.html"><code>AWS::IoT::ResourceSpecificLogging</code></a>.
 
@@ -69,31 +95,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_specific_loggings</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TargetName, TargetType, LogLevel, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_specific_loggings</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_specific_loggings</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_specific_loggings_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_specific_loggings</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +134,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_specific_logging</code>.
 ```sql
 SELECT
@@ -113,6 +154,19 @@ target_id
 FROM awscc.iot.resource_specific_loggings
 WHERE region = 'us-east-1' AND data__Identifier = '<TargetId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_specific_loggings</code> in a region.
+```sql
+SELECT
+region,
+target_id
+FROM awscc.iot.resource_specific_loggings_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -185,6 +239,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.resource_specific_loggings
+SET data__PatchDocument = string('{{ {
+    "LogLevel": log_level
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TargetId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/resource_specific_loggings_list_only/index.md b/website/docs/services/iot/resource_specific_loggings_list_only/index.md
deleted file mode 100644
index 8b685380f..000000000
--- a/website/docs/services/iot/resource_specific_loggings_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_specific_loggings_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_specific_loggings_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_specific_loggings</code> in a region or regions, for all properties use <a href="/services/iot/resource_specific_loggings/"><code>resource_specific_loggings</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_specific_loggings_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource-specific logging allows you to specify a logging level for a specific thing group.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.resource_specific_loggings_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "target_id",
-    "type": "string",
-    "description": "Unique Id for a Target (TargetType:TargetName), this will be internally built to serve as primary identifier for a log target."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_specific_loggings</code> in a region.
-```sql
-SELECT
-region,
-target_id
-FROM awscc.iot.resource_specific_loggings_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_specific_loggings_list_only</code> resource, see <a href="/services/iot/resource_specific_loggings/#permissions"><code>resource_specific_loggings</code></a>
-
diff --git a/website/docs/services/iot/role_aliases/index.md b/website/docs/services/iot/role_aliases/index.md
index 12bf5ec6d..c0c5f6c98 100644
--- a/website/docs/services/iot/role_aliases/index.md
+++ b/website/docs/services/iot/role_aliases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>role_alias</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "role_alias",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>role_alias</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "role_alias",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-rolealias.html"><code>AWS::IoT::RoleAlias</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>role_aliases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>role_aliases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>role_aliases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>role_aliases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>role_aliases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>role_alias</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.iot.role_aliases
 WHERE region = 'us-east-1' AND data__Identifier = '<RoleAlias>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>role_aliases</code> in a region.
+```sql
+SELECT
+region,
+role_alias
+FROM awscc.iot.role_aliases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +259,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.role_aliases
+SET data__PatchDocument = string('{{ {
+    "RoleArn": role_arn,
+    "CredentialDurationSeconds": credential_duration_seconds,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RoleAlias>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/role_aliases_list_only/index.md b/website/docs/services/iot/role_aliases_list_only/index.md
deleted file mode 100644
index 2b0ad92d7..000000000
--- a/website/docs/services/iot/role_aliases_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: role_aliases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - role_aliases_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>role_aliases</code> in a region or regions, for all properties use <a href="/services/iot/role_aliases/"><code>role_aliases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>role_aliases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Use the AWS::IoT::RoleAlias resource to declare an AWS IoT RoleAlias.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.role_aliases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "role_alias",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>role_aliases</code> in a region.
-```sql
-SELECT
-region,
-role_alias
-FROM awscc.iot.role_aliases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>role_aliases_list_only</code> resource, see <a href="/services/iot/role_aliases/#permissions"><code>role_aliases</code></a>
-
diff --git a/website/docs/services/iot/scheduled_audits/index.md b/website/docs/services/iot/scheduled_audits/index.md
index 26b7df5bf..a0c0da90e 100644
--- a/website/docs/services/iot/scheduled_audits/index.md
+++ b/website/docs/services/iot/scheduled_audits/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>scheduled_audit</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "scheduled_audit_name",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>scheduled_audit</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "scheduled_audit_name",
+    "type": "string",
+    "description": "The name you want to give to the scheduled audit."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-scheduledaudit.html"><code>AWS::IoT::ScheduledAudit</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>scheduled_audits</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Frequency, TargetCheckNames, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>scheduled_audits</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>scheduled_audits</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>scheduled_audits_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>scheduled_audits</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>scheduled_audit</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.iot.scheduled_audits
 WHERE region = 'us-east-1' AND data__Identifier = '<ScheduledAuditName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>scheduled_audits</code> in a region.
+```sql
+SELECT
+region,
+scheduled_audit_name
+FROM awscc.iot.scheduled_audits_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -228,6 +282,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.scheduled_audits
+SET data__PatchDocument = string('{{ {
+    "Frequency": frequency,
+    "DayOfMonth": day_of_month,
+    "DayOfWeek": day_of_week,
+    "TargetCheckNames": target_check_names,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ScheduledAuditName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/scheduled_audits_list_only/index.md b/website/docs/services/iot/scheduled_audits_list_only/index.md
deleted file mode 100644
index 763f17853..000000000
--- a/website/docs/services/iot/scheduled_audits_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: scheduled_audits_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - scheduled_audits_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>scheduled_audits</code> in a region or regions, for all properties use <a href="/services/iot/scheduled_audits/"><code>scheduled_audits</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>scheduled_audits_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Scheduled audits can be used to specify the checks you want to perform during an audit and how often the audit should be run.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.scheduled_audits_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "scheduled_audit_name",
-    "type": "string",
-    "description": "The name you want to give to the scheduled audit."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>scheduled_audits</code> in a region.
-```sql
-SELECT
-region,
-scheduled_audit_name
-FROM awscc.iot.scheduled_audits_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>scheduled_audits_list_only</code> resource, see <a href="/services/iot/scheduled_audits/#permissions"><code>scheduled_audits</code></a>
-
diff --git a/website/docs/services/iot/security_profiles/index.md b/website/docs/services/iot/security_profiles/index.md
index 1b37fd64d..e71a7d520 100644
--- a/website/docs/services/iot/security_profiles/index.md
+++ b/website/docs/services/iot/security_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>security_profile</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "security_profile_name",
@@ -265,6 +274,23 @@ Creates, updates, deletes or gets a <code>security_profile</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "security_profile_name",
+    "type": "string",
+    "description": "A unique identifier for the security profile."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-securityprofile.html"><code>AWS::IoT::SecurityProfile</code></a>.
 
@@ -274,31 +300,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>security_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>security_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>security_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>security_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>security_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -307,6 +339,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>security_profile</code>.
 ```sql
 SELECT
@@ -323,6 +364,19 @@ security_profile_arn
 FROM awscc.iot.security_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<SecurityProfileName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>security_profiles</code> in a region.
+```sql
+SELECT
+region,
+security_profile_name
+FROM awscc.iot.security_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -446,6 +500,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.security_profiles
+SET data__PatchDocument = string('{{ {
+    "SecurityProfileDescription": security_profile_description,
+    "Behaviors": behaviors,
+    "AlertTargets": alert_targets,
+    "AdditionalMetricsToRetainV2": additional_metrics_to_retain_v2,
+    "MetricsExportConfig": metrics_export_config,
+    "Tags": tags,
+    "TargetArns": target_arns
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SecurityProfileName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/security_profiles_list_only/index.md b/website/docs/services/iot/security_profiles_list_only/index.md
deleted file mode 100644
index e741bf803..000000000
--- a/website/docs/services/iot/security_profiles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: security_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - security_profiles_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>security_profiles</code> in a region or regions, for all properties use <a href="/services/iot/security_profiles/"><code>security_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>security_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A security profile defines a set of expected behaviors for devices in your account.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.security_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "security_profile_name",
-    "type": "string",
-    "description": "A unique identifier for the security profile."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>security_profiles</code> in a region.
-```sql
-SELECT
-region,
-security_profile_name
-FROM awscc.iot.security_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>security_profiles_list_only</code> resource, see <a href="/services/iot/security_profiles/#permissions"><code>security_profiles</code></a>
-
diff --git a/website/docs/services/iot/software_package_versions/index.md b/website/docs/services/iot/software_package_versions/index.md
index dcedcfbc6..a5a992f0e 100644
--- a/website/docs/services/iot/software_package_versions/index.md
+++ b/website/docs/services/iot/software_package_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>software_package_version</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "attributes",
@@ -160,6 +169,28 @@ Creates, updates, deletes or gets a <code>software_package_version</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "package_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "version_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-softwarepackageversion.html"><code>AWS::IoT::SoftwarePackageVersion</code></a>.
 
@@ -169,31 +200,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>software_package_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PackageName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>software_package_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>software_package_versions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>software_package_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>software_package_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -202,6 +239,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>software_package_version</code>.
 ```sql
 SELECT
@@ -221,6 +267,20 @@ version_name
 FROM awscc.iot.software_package_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<PackageName>|<VersionName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>software_package_versions</code> in a region.
+```sql
+SELECT
+region,
+package_name,
+version_name
+FROM awscc.iot.software_package_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -316,6 +376,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.software_package_versions
+SET data__PatchDocument = string('{{ {
+    "Attributes": attributes,
+    "Artifact": artifact,
+    "Description": description,
+    "Recipe": recipe,
+    "Sbom": sbom,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PackageName>|<VersionName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/software_package_versions_list_only/index.md b/website/docs/services/iot/software_package_versions_list_only/index.md
deleted file mode 100644
index 803bdf91b..000000000
--- a/website/docs/services/iot/software_package_versions_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: software_package_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - software_package_versions_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>software_package_versions</code> in a region or regions, for all properties use <a href="/services/iot/software_package_versions/"><code>software_package_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>software_package_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>resource definition</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.software_package_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "package_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "version_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>software_package_versions</code> in a region.
-```sql
-SELECT
-region,
-package_name,
-version_name
-FROM awscc.iot.software_package_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>software_package_versions_list_only</code> resource, see <a href="/services/iot/software_package_versions/#permissions"><code>software_package_versions</code></a>
-
diff --git a/website/docs/services/iot/software_packages/index.md b/website/docs/services/iot/software_packages/index.md
index de50df3b3..48835d954 100644
--- a/website/docs/services/iot/software_packages/index.md
+++ b/website/docs/services/iot/software_packages/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>software_package</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>software_package</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "package_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-softwarepackage.html"><code>AWS::IoT::SoftwarePackage</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>software_packages</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>software_packages</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>software_packages</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>software_packages_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>software_packages</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>software_package</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ tags
 FROM awscc.iot.software_packages
 WHERE region = 'us-east-1' AND data__Identifier = '<PackageName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>software_packages</code> in a region.
+```sql
+SELECT
+region,
+package_name
+FROM awscc.iot.software_packages_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -199,6 +253,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.software_packages
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PackageName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/software_packages_list_only/index.md b/website/docs/services/iot/software_packages_list_only/index.md
deleted file mode 100644
index 0eaad66a9..000000000
--- a/website/docs/services/iot/software_packages_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: software_packages_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - software_packages_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>software_packages</code> in a region or regions, for all properties use <a href="/services/iot/software_packages/"><code>software_packages</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>software_packages_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>resource definition</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.software_packages_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "package_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>software_packages</code> in a region.
-```sql
-SELECT
-region,
-package_name
-FROM awscc.iot.software_packages_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>software_packages_list_only</code> resource, see <a href="/services/iot/software_packages/#permissions"><code>software_packages</code></a>
-
diff --git a/website/docs/services/iot/thing_groups/index.md b/website/docs/services/iot/thing_groups/index.md
index aa90b6e9d..3cad0fd36 100644
--- a/website/docs/services/iot/thing_groups/index.md
+++ b/website/docs/services/iot/thing_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>thing_group</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -106,6 +115,23 @@ Creates, updates, deletes or gets a <code>thing_group</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "thing_group_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thinggroup.html"><code>AWS::IoT::ThingGroup</code></a>.
 
@@ -115,31 +141,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>thing_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>thing_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>thing_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>thing_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>thing_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -148,6 +180,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>thing_group</code>.
 ```sql
 SELECT
@@ -162,6 +203,19 @@ tags
 FROM awscc.iot.thing_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<ThingGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>thing_groups</code> in a region.
+```sql
+SELECT
+region,
+thing_group_name
+FROM awscc.iot.thing_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -251,6 +305,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.thing_groups
+SET data__PatchDocument = string('{{ {
+    "QueryString": query_string,
+    "ThingGroupProperties": thing_group_properties,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ThingGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/thing_groups_list_only/index.md b/website/docs/services/iot/thing_groups_list_only/index.md
deleted file mode 100644
index fb3ce2dec..000000000
--- a/website/docs/services/iot/thing_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: thing_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - thing_groups_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>thing_groups</code> in a region or regions, for all properties use <a href="/services/iot/thing_groups/"><code>thing_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>thing_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IoT::ThingGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.thing_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "thing_group_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>thing_groups</code> in a region.
-```sql
-SELECT
-region,
-thing_group_name
-FROM awscc.iot.thing_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>thing_groups_list_only</code> resource, see <a href="/services/iot/thing_groups/#permissions"><code>thing_groups</code></a>
-
diff --git a/website/docs/services/iot/thing_types/index.md b/website/docs/services/iot/thing_types/index.md
index 75c369716..63201cada 100644
--- a/website/docs/services/iot/thing_types/index.md
+++ b/website/docs/services/iot/thing_types/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>thing_type</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -123,6 +132,23 @@ Creates, updates, deletes or gets a <code>thing_type</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "thing_type_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thingtype.html"><code>AWS::IoT::ThingType</code></a>.
 
@@ -132,31 +158,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>thing_types</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>thing_types</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>thing_types</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>thing_types_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>thing_types</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -165,6 +197,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>thing_type</code>.
 ```sql
 SELECT
@@ -178,6 +219,19 @@ tags
 FROM awscc.iot.thing_types
 WHERE region = 'us-east-1' AND data__Identifier = '<ThingTypeName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>thing_types</code> in a region.
+```sql
+SELECT
+region,
+thing_type_name
+FROM awscc.iot.thing_types_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -266,6 +320,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.thing_types
+SET data__PatchDocument = string('{{ {
+    "DeprecateThingType": deprecate_thing_type,
+    "ThingTypeProperties": thing_type_properties,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ThingTypeName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/thing_types_list_only/index.md b/website/docs/services/iot/thing_types_list_only/index.md
deleted file mode 100644
index ed0352870..000000000
--- a/website/docs/services/iot/thing_types_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: thing_types_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - thing_types_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>thing_types</code> in a region or regions, for all properties use <a href="/services/iot/thing_types/"><code>thing_types</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>thing_types_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IoT::ThingType</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.thing_types_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "thing_type_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>thing_types</code> in a region.
-```sql
-SELECT
-region,
-thing_type_name
-FROM awscc.iot.thing_types_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>thing_types_list_only</code> resource, see <a href="/services/iot/thing_types/#permissions"><code>thing_types</code></a>
-
diff --git a/website/docs/services/iot/things/index.md b/website/docs/services/iot/things/index.md
index a2916255a..a871bba2b 100644
--- a/website/docs/services/iot/things/index.md
+++ b/website/docs/services/iot/things/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>thing</code> resource or lists <code>t
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -67,6 +76,23 @@ Creates, updates, deletes or gets a <code>thing</code> resource or lists <code>t
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "thing_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thing.html"><code>AWS::IoT::Thing</code></a>.
 
@@ -76,31 +102,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>things</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>things</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>things</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>things_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>things</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -109,6 +141,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>thing</code>.
 ```sql
 SELECT
@@ -120,6 +161,19 @@ thing_name
 FROM awscc.iot.things
 WHERE region = 'us-east-1' AND data__Identifier = '<ThingName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>things</code> in a region.
+```sql
+SELECT
+region,
+thing_name
+FROM awscc.iot.things_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -187,6 +241,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.things
+SET data__PatchDocument = string('{{ {
+    "AttributePayload": attribute_payload
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ThingName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/things_list_only/index.md b/website/docs/services/iot/things_list_only/index.md
deleted file mode 100644
index 299697b27..000000000
--- a/website/docs/services/iot/things_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: things_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - things_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>things</code> in a region or regions, for all properties use <a href="/services/iot/things/"><code>things</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>things_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IoT::Thing</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.things_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "thing_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>things</code> in a region.
-```sql
-SELECT
-region,
-thing_name
-FROM awscc.iot.things_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>things_list_only</code> resource, see <a href="/services/iot/things/#permissions"><code>things</code></a>
-
diff --git a/website/docs/services/iot/topic_rule_destinations/index.md b/website/docs/services/iot/topic_rule_destinations/index.md
index 1d1c50c25..bce6d9eba 100644
--- a/website/docs/services/iot/topic_rule_destinations/index.md
+++ b/website/docs/services/iot/topic_rule_destinations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>topic_rule_destination</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets a <code>topic_rule_destination</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Amazon Resource Name (ARN)."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-topicruledestination.html"><code>AWS::IoT::TopicRuleDestination</code></a>.
 
@@ -103,31 +129,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>topic_rule_destinations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>topic_rule_destinations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>topic_rule_destinations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>topic_rule_destinations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>topic_rule_destinations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>topic_rule_destination</code>.
 ```sql
 SELECT
@@ -148,6 +189,19 @@ vpc_properties
 FROM awscc.iot.topic_rule_destinations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>topic_rule_destinations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.iot.topic_rule_destinations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -227,6 +281,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.topic_rule_destinations
+SET data__PatchDocument = string('{{ {
+    "Status": status
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/topic_rule_destinations_list_only/index.md b/website/docs/services/iot/topic_rule_destinations_list_only/index.md
deleted file mode 100644
index 375f64ba9..000000000
--- a/website/docs/services/iot/topic_rule_destinations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: topic_rule_destinations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - topic_rule_destinations_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>topic_rule_destinations</code> in a region or regions, for all properties use <a href="/services/iot/topic_rule_destinations/"><code>topic_rule_destinations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>topic_rule_destinations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IoT::TopicRuleDestination</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.topic_rule_destinations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Amazon Resource Name (ARN)."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>topic_rule_destinations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.iot.topic_rule_destinations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>topic_rule_destinations_list_only</code> resource, see <a href="/services/iot/topic_rule_destinations/#permissions"><code>topic_rule_destinations</code></a>
-
diff --git a/website/docs/services/iot/topic_rules/index.md b/website/docs/services/iot/topic_rules/index.md
index 7f59ef481..ebcf33a3e 100644
--- a/website/docs/services/iot/topic_rules/index.md
+++ b/website/docs/services/iot/topic_rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>topic_rule</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -705,6 +714,23 @@ Creates, updates, deletes or gets a <code>topic_rule</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "rule_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-topicrule.html"><code>AWS::IoT::TopicRule</code></a>.
 
@@ -714,31 +740,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>topic_rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TopicRulePayload, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>topic_rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>topic_rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>topic_rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>topic_rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -747,6 +779,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>topic_rule</code>.
 ```sql
 SELECT
@@ -758,6 +799,19 @@ tags
 FROM awscc.iot.topic_rules
 WHERE region = 'us-east-1' AND data__Identifier = '<RuleName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>topic_rules</code> in a region.
+```sql
+SELECT
+region,
+rule_name
+FROM awscc.iot.topic_rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -983,6 +1037,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iot.topic_rules
+SET data__PatchDocument = string('{{ {
+    "TopicRulePayload": topic_rule_payload,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RuleName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iot/topic_rules_list_only/index.md b/website/docs/services/iot/topic_rules_list_only/index.md
deleted file mode 100644
index 977686ae3..000000000
--- a/website/docs/services/iot/topic_rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: topic_rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - topic_rules_list_only
-  - iot
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>topic_rules</code> in a region or regions, for all properties use <a href="/services/iot/topic_rules/"><code>topic_rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>topic_rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IoT::TopicRule</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iot.topic_rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "rule_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>topic_rules</code> in a region.
-```sql
-SELECT
-region,
-rule_name
-FROM awscc.iot.topic_rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>topic_rules_list_only</code> resource, see <a href="/services/iot/topic_rules/#permissions"><code>topic_rules</code></a>
-
diff --git a/website/docs/services/iotanalytics/datasets/index.md b/website/docs/services/iotanalytics/datasets/index.md
index a15a76dd9..f082d509b 100644
--- a/website/docs/services/iotanalytics/datasets/index.md
+++ b/website/docs/services/iotanalytics/datasets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>dataset</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "actions",
@@ -338,6 +347,23 @@ Creates, updates, deletes or gets a <code>dataset</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "dataset_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-dataset.html"><code>AWS::IoTAnalytics::Dataset</code></a>.
 
@@ -347,31 +373,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Actions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>datasets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -380,6 +412,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dataset</code>.
 ```sql
 SELECT
@@ -396,6 +437,19 @@ tags
 FROM awscc.iotanalytics.datasets
 WHERE region = 'us-east-1' AND data__Identifier = '<DatasetName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>datasets</code> in a region.
+```sql
+SELECT
+region,
+dataset_name
+FROM awscc.iotanalytics.datasets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -531,6 +585,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotanalytics.datasets
+SET data__PatchDocument = string('{{ {
+    "Actions": actions,
+    "LateDataRules": late_data_rules,
+    "ContentDeliveryRules": content_delivery_rules,
+    "Triggers": triggers,
+    "VersioningConfiguration": versioning_configuration,
+    "RetentionPeriod": retention_period,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DatasetName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotanalytics/datasets_list_only/index.md b/website/docs/services/iotanalytics/datasets_list_only/index.md
deleted file mode 100644
index 3883f1721..000000000
--- a/website/docs/services/iotanalytics/datasets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: datasets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - datasets_list_only
-  - iotanalytics
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>datasets</code> in a region or regions, for all properties use <a href="/services/iotanalytics/datasets/"><code>datasets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>datasets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IoTAnalytics::Dataset</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotanalytics.datasets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "dataset_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>datasets</code> in a region.
-```sql
-SELECT
-region,
-dataset_name
-FROM awscc.iotanalytics.datasets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>datasets_list_only</code> resource, see <a href="/services/iotanalytics/datasets/#permissions"><code>datasets</code></a>
-
diff --git a/website/docs/services/iotanalytics/index.md b/website/docs/services/iotanalytics/index.md
index 030055c93..07c979dab 100644
--- a/website/docs/services/iotanalytics/index.md
+++ b/website/docs/services/iotanalytics/index.md
@@ -20,7 +20,7 @@ The iotanalytics service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The iotanalytics service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/iotanalytics/datasets/">datasets</a><br />
-<a href="/services/iotanalytics/datasets_list_only/">datasets_list_only</a>
+<a href="/services/iotanalytics/datasets/">datasets</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/iotanalytics/pipelines/">pipelines</a><br />
-<a href="/services/iotanalytics/pipelines_list_only/">pipelines_list_only</a>
+<a href="/services/iotanalytics/pipelines/">pipelines</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/iotanalytics/pipelines/index.md b/website/docs/services/iotanalytics/pipelines/index.md
index 85f62be88..a3c977816 100644
--- a/website/docs/services/iotanalytics/pipelines/index.md
+++ b/website/docs/services/iotanalytics/pipelines/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>pipeline</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -319,6 +328,23 @@ Creates, updates, deletes or gets a <code>pipeline</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "pipeline_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-pipeline.html"><code>AWS::IoTAnalytics::Pipeline</code></a>.
 
@@ -328,31 +354,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PipelineActivities, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>pipelines_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -361,6 +393,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>pipeline</code>.
 ```sql
 SELECT
@@ -372,6 +413,19 @@ pipeline_activities
 FROM awscc.iotanalytics.pipelines
 WHERE region = 'us-east-1' AND data__Identifier = '<PipelineName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>pipelines</code> in a region.
+```sql
+SELECT
+region,
+pipeline_name
+FROM awscc.iotanalytics.pipelines_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -489,6 +543,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotanalytics.pipelines
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "PipelineActivities": pipeline_activities
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PipelineName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotanalytics/pipelines_list_only/index.md b/website/docs/services/iotanalytics/pipelines_list_only/index.md
deleted file mode 100644
index 51660c009..000000000
--- a/website/docs/services/iotanalytics/pipelines_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: pipelines_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - pipelines_list_only
-  - iotanalytics
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>pipelines</code> in a region or regions, for all properties use <a href="/services/iotanalytics/pipelines/"><code>pipelines</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>pipelines_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IoTAnalytics::Pipeline</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotanalytics.pipelines_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "pipeline_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>pipelines</code> in a region.
-```sql
-SELECT
-region,
-pipeline_name
-FROM awscc.iotanalytics.pipelines_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>pipelines_list_only</code> resource, see <a href="/services/iotanalytics/pipelines/#permissions"><code>pipelines</code></a>
-
diff --git a/website/docs/services/iotcoredeviceadvisor/index.md b/website/docs/services/iotcoredeviceadvisor/index.md
index de7b1afd3..b6fee0a6f 100644
--- a/website/docs/services/iotcoredeviceadvisor/index.md
+++ b/website/docs/services/iotcoredeviceadvisor/index.md
@@ -20,7 +20,7 @@ The iotcoredeviceadvisor service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The iotcoredeviceadvisor service documentation.
 <a href="/services/iotcoredeviceadvisor/suite_definitions/">suite_definitions</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/iotcoredeviceadvisor/suite_definitions_list_only/">suite_definitions_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/iotcoredeviceadvisor/suite_definitions/index.md b/website/docs/services/iotcoredeviceadvisor/suite_definitions/index.md
index 8fa1fcfc0..7cdaa6969 100644
--- a/website/docs/services/iotcoredeviceadvisor/suite_definitions/index.md
+++ b/website/docs/services/iotcoredeviceadvisor/suite_definitions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>suite_definition</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "suite_definition_configuration",
@@ -116,6 +125,23 @@ Creates, updates, deletes or gets a <code>suite_definition</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "suite_definition_id",
+    "type": "string",
+    "description": "The unique identifier for the suite definition."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotcoredeviceadvisor-suitedefinition.html"><code>AWS::IoTCoreDeviceAdvisor::SuiteDefinition</code></a>.
 
@@ -125,31 +151,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>suite_definitions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SuiteDefinitionConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>suite_definitions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>suite_definitions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>suite_definitions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>suite_definitions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -158,6 +190,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>suite_definition</code>.
 ```sql
 SELECT
@@ -170,6 +211,19 @@ tags
 FROM awscc.iotcoredeviceadvisor.suite_definitions
 WHERE region = 'us-east-1' AND data__Identifier = '<SuiteDefinitionId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>suite_definitions</code> in a region.
+```sql
+SELECT
+region,
+suite_definition_id
+FROM awscc.iotcoredeviceadvisor.suite_definitions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -243,6 +297,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotcoredeviceadvisor.suite_definitions
+SET data__PatchDocument = string('{{ {
+    "SuiteDefinitionConfiguration": suite_definition_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SuiteDefinitionId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotcoredeviceadvisor/suite_definitions_list_only/index.md b/website/docs/services/iotcoredeviceadvisor/suite_definitions_list_only/index.md
deleted file mode 100644
index 176c14e68..000000000
--- a/website/docs/services/iotcoredeviceadvisor/suite_definitions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: suite_definitions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - suite_definitions_list_only
-  - iotcoredeviceadvisor
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>suite_definitions</code> in a region or regions, for all properties use <a href="/services/iotcoredeviceadvisor/suite_definitions/"><code>suite_definitions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>suite_definitions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An example resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotcoredeviceadvisor.suite_definitions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "suite_definition_id",
-    "type": "string",
-    "description": "The unique identifier for the suite definition."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>suite_definitions</code> in a region.
-```sql
-SELECT
-region,
-suite_definition_id
-FROM awscc.iotcoredeviceadvisor.suite_definitions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>suite_definitions_list_only</code> resource, see <a href="/services/iotcoredeviceadvisor/suite_definitions/#permissions"><code>suite_definitions</code></a>
-
diff --git a/website/docs/services/iotevents/alarm_models/index.md b/website/docs/services/iotevents/alarm_models/index.md
index 2d605a42b..e41c61f8b 100644
--- a/website/docs/services/iotevents/alarm_models/index.md
+++ b/website/docs/services/iotevents/alarm_models/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>alarm_model</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "alarm_model_name",
@@ -374,6 +383,23 @@ Creates, updates, deletes or gets an <code>alarm_model</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "alarm_model_name",
+    "type": "string",
+    "description": "The name of the alarm model."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-alarmmodel.html"><code>AWS::IoTEvents::AlarmModel</code></a>.
 
@@ -383,31 +409,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>alarm_models</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RoleArn, AlarmRule, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>alarm_models</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>alarm_models</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>alarm_models_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>alarm_models</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -416,6 +448,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>alarm_model</code>.
 ```sql
 SELECT
@@ -432,6 +473,19 @@ tags
 FROM awscc.iotevents.alarm_models
 WHERE region = 'us-east-1' AND data__Identifier = '<AlarmModelName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>alarm_models</code> in a region.
+```sql
+SELECT
+region,
+alarm_model_name
+FROM awscc.iotevents.alarm_models_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -588,6 +642,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotevents.alarm_models
+SET data__PatchDocument = string('{{ {
+    "AlarmModelDescription": alarm_model_description,
+    "RoleArn": role_arn,
+    "Severity": severity,
+    "AlarmRule": alarm_rule,
+    "AlarmEventActions": alarm_event_actions,
+    "AlarmCapabilities": alarm_capabilities,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AlarmModelName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotevents/alarm_models_list_only/index.md b/website/docs/services/iotevents/alarm_models_list_only/index.md
deleted file mode 100644
index 806f5b500..000000000
--- a/website/docs/services/iotevents/alarm_models_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: alarm_models_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - alarm_models_list_only
-  - iotevents
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>alarm_models</code> in a region or regions, for all properties use <a href="/services/iotevents/alarm_models/"><code>alarm_models</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>alarm_models_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents an alarm model to monitor an ITE input attribute. You can use the alarm to get notified when the value is outside a specified range. For more information, see &#91;Create an alarm model&#93;(https://docs.aws.amazon.com/iotevents/latest/developerguide/create-alarms.html) in the &#42;Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotevents.alarm_models_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "alarm_model_name",
-    "type": "string",
-    "description": "The name of the alarm model."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>alarm_models</code> in a region.
-```sql
-SELECT
-region,
-alarm_model_name
-FROM awscc.iotevents.alarm_models_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>alarm_models_list_only</code> resource, see <a href="/services/iotevents/alarm_models/#permissions"><code>alarm_models</code></a>
-
diff --git a/website/docs/services/iotevents/detector_models/index.md b/website/docs/services/iotevents/detector_models/index.md
index 5cf962f8f..ca6bab7a8 100644
--- a/website/docs/services/iotevents/detector_models/index.md
+++ b/website/docs/services/iotevents/detector_models/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>detector_model</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "detector_model_definition",
@@ -147,6 +156,23 @@ Creates, updates, deletes or gets a <code>detector_model</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "detector_model_name",
+    "type": "string",
+    "description": "The name of the detector model."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-detectormodel.html"><code>AWS::IoTEvents::DetectorModel</code></a>.
 
@@ -156,31 +182,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>detector_models</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DetectorModelDefinition, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>detector_models</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>detector_models</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>detector_models_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>detector_models</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -189,6 +221,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>detector_model</code>.
 ```sql
 SELECT
@@ -203,6 +244,19 @@ tags
 FROM awscc.iotevents.detector_models
 WHERE region = 'us-east-1' AND data__Identifier = '<DetectorModelName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>detector_models</code> in a region.
+```sql
+SELECT
+region,
+detector_model_name
+FROM awscc.iotevents.detector_models_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -373,6 +427,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotevents.detector_models
+SET data__PatchDocument = string('{{ {
+    "DetectorModelDefinition": detector_model_definition,
+    "DetectorModelDescription": detector_model_description,
+    "EvaluationMethod": evaluation_method,
+    "RoleArn": role_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DetectorModelName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotevents/detector_models_list_only/index.md b/website/docs/services/iotevents/detector_models_list_only/index.md
deleted file mode 100644
index cf67a5c31..000000000
--- a/website/docs/services/iotevents/detector_models_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: detector_models_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - detector_models_list_only
-  - iotevents
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>detector_models</code> in a region or regions, for all properties use <a href="/services/iotevents/detector_models/"><code>detector_models</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>detector_models_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::IoTEvents::DetectorModel resource creates a detector model. You create a &#42;detector model&#42; (a model of your equipment or process) using &#42;states&#42;. For each state, you define conditional (Boolean) logic that evaluates the incoming inputs to detect significant events. When an event is detected, it can change the state or trigger custom-built or predefined actions using other AWS services. You can define additional events that trigger actions when entering or exiting a state and, optionally, when a condition is met. For more information, see &#91;How to Use&#93;(https://docs.aws.amazon.com/iotevents/latest/developerguide/how-to-use-iotevents.html) in the &#42;Developer Guide&#42;.<br />When you successfully update a detector model (using the ITE console, ITE API or CLI commands, or CFN) all detector instances created by the model are reset to their initial states. (The detector's &#96;&#96;state&#96;&#96;, and the values of any variables and timers are reset.)<br />When you successfully update a detector model (using the ITE console, ITE API or CLI commands, or CFN) the version number of the detector model is incremented. (A detector model with version number 1 before the update has version number 2 after the update succeeds.)<br />If you attempt to update a detector model using CFN and the update does not succeed, the system may, in some cases, restore the original detector model. When this occurs, the detector model's version is incremented twice (for example, from version 1 to version 3) and the detector instances are reset.<br />Also, be aware that if you attempt to update several detector models at once using CFN, some updates may succeed and others fail. In this case, the effects on each detector model's detector instances and version number depend on whether the update succeeded or failed, with the results as stated.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotevents.detector_models_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "detector_model_name",
-    "type": "string",
-    "description": "The name of the detector model."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>detector_models</code> in a region.
-```sql
-SELECT
-region,
-detector_model_name
-FROM awscc.iotevents.detector_models_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>detector_models_list_only</code> resource, see <a href="/services/iotevents/detector_models/#permissions"><code>detector_models</code></a>
-
diff --git a/website/docs/services/iotevents/index.md b/website/docs/services/iotevents/index.md
index 0f0bb6aac..fb516a806 100644
--- a/website/docs/services/iotevents/index.md
+++ b/website/docs/services/iotevents/index.md
@@ -20,7 +20,7 @@ The iotevents service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The iotevents service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/iotevents/alarm_models/">alarm_models</a><br />
-<a href="/services/iotevents/alarm_models_list_only/">alarm_models_list_only</a><br />
 <a href="/services/iotevents/detector_models/">detector_models</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/iotevents/detector_models_list_only/">detector_models_list_only</a><br />
-<a href="/services/iotevents/inputs/">inputs</a><br />
-<a href="/services/iotevents/inputs_list_only/">inputs_list_only</a>
+<a href="/services/iotevents/inputs/">inputs</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/iotevents/inputs/index.md b/website/docs/services/iotevents/inputs/index.md
index f4f63e23b..02b1fc2c4 100644
--- a/website/docs/services/iotevents/inputs/index.md
+++ b/website/docs/services/iotevents/inputs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>input</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "input_definition",
@@ -86,6 +95,23 @@ Creates, updates, deletes or gets an <code>input</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "input_name",
+    "type": "string",
+    "description": "The name of the input."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-input.html"><code>AWS::IoTEvents::Input</code></a>.
 
@@ -95,31 +121,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>inputs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InputDefinition, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>inputs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>inputs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>inputs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>inputs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -128,6 +160,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>input</code>.
 ```sql
 SELECT
@@ -139,6 +180,19 @@ tags
 FROM awscc.iotevents.inputs
 WHERE region = 'us-east-1' AND data__Identifier = '<InputName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>inputs</code> in a region.
+```sql
+SELECT
+region,
+input_name
+FROM awscc.iotevents.inputs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -215,6 +269,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotevents.inputs
+SET data__PatchDocument = string('{{ {
+    "InputDefinition": input_definition,
+    "InputDescription": input_description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InputName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotevents/inputs_list_only/index.md b/website/docs/services/iotevents/inputs_list_only/index.md
deleted file mode 100644
index 02bead967..000000000
--- a/website/docs/services/iotevents/inputs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: inputs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - inputs_list_only
-  - iotevents
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>inputs</code> in a region or regions, for all properties use <a href="/services/iotevents/inputs/"><code>inputs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>inputs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::IoTEvents::Input resource creates an input. To monitor your devices and processes, they must have a way to get telemetry data into ITE. This is done by sending messages as &#42;inputs&#42; to ITE. For more information, see &#91;How to Use&#93;(https://docs.aws.amazon.com/iotevents/latest/developerguide/how-to-use-iotevents.html) in the &#42;Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotevents.inputs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "input_name",
-    "type": "string",
-    "description": "The name of the input."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>inputs</code> in a region.
-```sql
-SELECT
-region,
-input_name
-FROM awscc.iotevents.inputs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>inputs_list_only</code> resource, see <a href="/services/iotevents/inputs/#permissions"><code>inputs</code></a>
-
diff --git a/website/docs/services/iotfleetwise/campaigns/index.md b/website/docs/services/iotfleetwise/campaigns/index.md
index 98fde5a5b..2fd606dd9 100644
--- a/website/docs/services/iotfleetwise/campaigns/index.md
+++ b/website/docs/services/iotfleetwise/campaigns/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>campaign</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "status",
@@ -281,6 +290,23 @@ Creates, updates, deletes or gets a <code>campaign</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleetwise-campaign.html"><code>AWS::IoTFleetWise::Campaign</code></a>.
 
@@ -290,31 +316,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>campaigns</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, CollectionScheme, SignalCatalogArn, TargetArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>campaigns</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>campaigns</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>campaigns_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>campaigns</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -323,6 +355,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>campaign</code>.
 ```sql
 SELECT
@@ -353,6 +394,19 @@ tags
 FROM awscc.iotfleetwise.campaigns
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>campaigns</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.iotfleetwise.campaigns_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -516,6 +570,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotfleetwise.campaigns
+SET data__PatchDocument = string('{{ {
+    "Action": action,
+    "Description": description,
+    "DataExtraDimensions": data_extra_dimensions,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotfleetwise/campaigns_list_only/index.md b/website/docs/services/iotfleetwise/campaigns_list_only/index.md
deleted file mode 100644
index 12ae28cef..000000000
--- a/website/docs/services/iotfleetwise/campaigns_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: campaigns_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - campaigns_list_only
-  - iotfleetwise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>campaigns</code> in a region or regions, for all properties use <a href="/services/iotfleetwise/campaigns/"><code>campaigns</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>campaigns_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::IoTFleetWise::Campaign Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotfleetwise.campaigns_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>campaigns</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.iotfleetwise.campaigns_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>campaigns_list_only</code> resource, see <a href="/services/iotfleetwise/campaigns/#permissions"><code>campaigns</code></a>
-
diff --git a/website/docs/services/iotfleetwise/decoder_manifests/index.md b/website/docs/services/iotfleetwise/decoder_manifests/index.md
index a37b69e1a..bd24205be 100644
--- a/website/docs/services/iotfleetwise/decoder_manifests/index.md
+++ b/website/docs/services/iotfleetwise/decoder_manifests/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>decoder_manifest</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -107,6 +116,23 @@ Creates, updates, deletes or gets a <code>decoder_manifest</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleetwise-decodermanifest.html"><code>AWS::IoTFleetWise::DecoderManifest</code></a>.
 
@@ -116,31 +142,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>decoder_manifests</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, ModelManifestArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>decoder_manifests</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>decoder_manifests</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>decoder_manifests_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>decoder_manifests</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -149,6 +181,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>decoder_manifest</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ tags
 FROM awscc.iotfleetwise.decoder_manifests
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>decoder_manifests</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.iotfleetwise.decoder_manifests_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -261,6 +315,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotfleetwise.decoder_manifests
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "NetworkInterfaces": network_interfaces,
+    "SignalDecoders": signal_decoders,
+    "Status": status,
+    "DefaultForUnmappedSignals": default_for_unmapped_signals,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotfleetwise/decoder_manifests_list_only/index.md b/website/docs/services/iotfleetwise/decoder_manifests_list_only/index.md
deleted file mode 100644
index 54440e5ba..000000000
--- a/website/docs/services/iotfleetwise/decoder_manifests_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: decoder_manifests_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - decoder_manifests_list_only
-  - iotfleetwise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>decoder_manifests</code> in a region or regions, for all properties use <a href="/services/iotfleetwise/decoder_manifests/"><code>decoder_manifests</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>decoder_manifests_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::IoTFleetWise::DecoderManifest Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotfleetwise.decoder_manifests_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>decoder_manifests</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.iotfleetwise.decoder_manifests_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>decoder_manifests_list_only</code> resource, see <a href="/services/iotfleetwise/decoder_manifests/#permissions"><code>decoder_manifests</code></a>
-
diff --git a/website/docs/services/iotfleetwise/fleets/index.md b/website/docs/services/iotfleetwise/fleets/index.md
index b176a4950..31b9d2c82 100644
--- a/website/docs/services/iotfleetwise/fleets/index.md
+++ b/website/docs/services/iotfleetwise/fleets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>fleet</code> resource or lists <code>f
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>fleet</code> resource or lists <code>f
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleetwise-fleet.html"><code>AWS::IoTFleetWise::Fleet</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Id, SignalCatalogArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>fleets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>fleet</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.iotfleetwise.fleets
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>fleets</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.iotfleetwise.fleets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotfleetwise.fleets
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotfleetwise/fleets_list_only/index.md b/website/docs/services/iotfleetwise/fleets_list_only/index.md
deleted file mode 100644
index be34951b0..000000000
--- a/website/docs/services/iotfleetwise/fleets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: fleets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - fleets_list_only
-  - iotfleetwise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>fleets</code> in a region or regions, for all properties use <a href="/services/iotfleetwise/fleets/"><code>fleets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>fleets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::IoTFleetWise::Fleet Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotfleetwise.fleets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>fleets</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.iotfleetwise.fleets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>fleets_list_only</code> resource, see <a href="/services/iotfleetwise/fleets/#permissions"><code>fleets</code></a>
-
diff --git a/website/docs/services/iotfleetwise/index.md b/website/docs/services/iotfleetwise/index.md
index add8de653..f11d59bff 100644
--- a/website/docs/services/iotfleetwise/index.md
+++ b/website/docs/services/iotfleetwise/index.md
@@ -20,7 +20,7 @@ The iotfleetwise service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>14</b></span><br />
+<span>total resources:&nbsp;<b>7</b></span><br />
 </div>
 </div>
 
@@ -30,20 +30,13 @@ The iotfleetwise service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/iotfleetwise/campaigns/">campaigns</a><br />
-<a href="/services/iotfleetwise/campaigns_list_only/">campaigns_list_only</a><br />
 <a href="/services/iotfleetwise/decoder_manifests/">decoder_manifests</a><br />
-<a href="/services/iotfleetwise/decoder_manifests_list_only/">decoder_manifests_list_only</a><br />
 <a href="/services/iotfleetwise/fleets/">fleets</a><br />
-<a href="/services/iotfleetwise/fleets_list_only/">fleets_list_only</a><br />
 <a href="/services/iotfleetwise/model_manifests/">model_manifests</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/iotfleetwise/model_manifests_list_only/">model_manifests_list_only</a><br />
 <a href="/services/iotfleetwise/signal_catalogs/">signal_catalogs</a><br />
-<a href="/services/iotfleetwise/signal_catalogs_list_only/">signal_catalogs_list_only</a><br />
 <a href="/services/iotfleetwise/state_templates/">state_templates</a><br />
-<a href="/services/iotfleetwise/state_templates_list_only/">state_templates_list_only</a><br />
-<a href="/services/iotfleetwise/vehicles/">vehicles</a><br />
-<a href="/services/iotfleetwise/vehicles_list_only/">vehicles_list_only</a>
+<a href="/services/iotfleetwise/vehicles/">vehicles</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/iotfleetwise/model_manifests/index.md b/website/docs/services/iotfleetwise/model_manifests/index.md
index f5cd87af5..003735aad 100644
--- a/website/docs/services/iotfleetwise/model_manifests/index.md
+++ b/website/docs/services/iotfleetwise/model_manifests/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>model_manifest</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>model_manifest</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleetwise-modelmanifest.html"><code>AWS::IoTFleetWise::ModelManifest</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>model_manifests</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SignalCatalogArn, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>model_manifests</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>model_manifests</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>model_manifests_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>model_manifests</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>model_manifest</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ tags
 FROM awscc.iotfleetwise.model_manifests
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>model_manifests</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.iotfleetwise.model_manifests_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -240,6 +294,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotfleetwise.model_manifests
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Nodes": nodes,
+    "SignalCatalogArn": signal_catalog_arn,
+    "Status": status,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotfleetwise/model_manifests_list_only/index.md b/website/docs/services/iotfleetwise/model_manifests_list_only/index.md
deleted file mode 100644
index a482f2f2a..000000000
--- a/website/docs/services/iotfleetwise/model_manifests_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: model_manifests_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - model_manifests_list_only
-  - iotfleetwise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>model_manifests</code> in a region or regions, for all properties use <a href="/services/iotfleetwise/model_manifests/"><code>model_manifests</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>model_manifests_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::IoTFleetWise::ModelManifest Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotfleetwise.model_manifests_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>model_manifests</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.iotfleetwise.model_manifests_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>model_manifests_list_only</code> resource, see <a href="/services/iotfleetwise/model_manifests/#permissions"><code>model_manifests</code></a>
-
diff --git a/website/docs/services/iotfleetwise/signal_catalogs/index.md b/website/docs/services/iotfleetwise/signal_catalogs/index.md
index 2f790a9ab..2f453acd5 100644
--- a/website/docs/services/iotfleetwise/signal_catalogs/index.md
+++ b/website/docs/services/iotfleetwise/signal_catalogs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>signal_catalog</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -119,6 +128,23 @@ Creates, updates, deletes or gets a <code>signal_catalog</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleetwise-signalcatalog.html"><code>AWS::IoTFleetWise::SignalCatalog</code></a>.
 
@@ -128,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>signal_catalogs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>signal_catalogs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>signal_catalogs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>signal_catalogs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>signal_catalogs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>signal_catalog</code>.
 ```sql
 SELECT
@@ -176,6 +217,19 @@ tags
 FROM awscc.iotfleetwise.signal_catalogs
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>signal_catalogs</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.iotfleetwise.signal_catalogs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -268,6 +322,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotfleetwise.signal_catalogs
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Nodes": nodes,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotfleetwise/signal_catalogs_list_only/index.md b/website/docs/services/iotfleetwise/signal_catalogs_list_only/index.md
deleted file mode 100644
index 067c33f56..000000000
--- a/website/docs/services/iotfleetwise/signal_catalogs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: signal_catalogs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - signal_catalogs_list_only
-  - iotfleetwise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>signal_catalogs</code> in a region or regions, for all properties use <a href="/services/iotfleetwise/signal_catalogs/"><code>signal_catalogs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>signal_catalogs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::IoTFleetWise::SignalCatalog Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotfleetwise.signal_catalogs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>signal_catalogs</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.iotfleetwise.signal_catalogs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>signal_catalogs_list_only</code> resource, see <a href="/services/iotfleetwise/signal_catalogs/#permissions"><code>signal_catalogs</code></a>
-
diff --git a/website/docs/services/iotfleetwise/state_templates/index.md b/website/docs/services/iotfleetwise/state_templates/index.md
index 1a8d29a19..146f8144c 100644
--- a/website/docs/services/iotfleetwise/state_templates/index.md
+++ b/website/docs/services/iotfleetwise/state_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>state_template</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -107,6 +116,23 @@ Creates, updates, deletes or gets a <code>state_template</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleetwise-statetemplate.html"><code>AWS::IoTFleetWise::StateTemplate</code></a>.
 
@@ -116,31 +142,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>state_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, SignalCatalogArn, StateTemplateProperties, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>state_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>state_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>state_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>state_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -149,6 +181,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>state_template</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ tags
 FROM awscc.iotfleetwise.state_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>state_templates</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.iotfleetwise.state_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -260,6 +314,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotfleetwise.state_templates
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "StateTemplateProperties": state_template_properties,
+    "DataExtraDimensions": data_extra_dimensions,
+    "MetadataExtraDimensions": metadata_extra_dimensions,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotfleetwise/state_templates_list_only/index.md b/website/docs/services/iotfleetwise/state_templates_list_only/index.md
deleted file mode 100644
index e94910590..000000000
--- a/website/docs/services/iotfleetwise/state_templates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: state_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - state_templates_list_only
-  - iotfleetwise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>state_templates</code> in a region or regions, for all properties use <a href="/services/iotfleetwise/state_templates/"><code>state_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>state_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::IoTFleetWise::StateTemplate Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotfleetwise.state_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>state_templates</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.iotfleetwise.state_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>state_templates_list_only</code> resource, see <a href="/services/iotfleetwise/state_templates/#permissions"><code>state_templates</code></a>
-
diff --git a/website/docs/services/iotfleetwise/vehicles/index.md b/website/docs/services/iotfleetwise/vehicles/index.md
index 9665cc93f..df23f4cb5 100644
--- a/website/docs/services/iotfleetwise/vehicles/index.md
+++ b/website/docs/services/iotfleetwise/vehicles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vehicle</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -114,6 +123,23 @@ Creates, updates, deletes or gets a <code>vehicle</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleetwise-vehicle.html"><code>AWS::IoTFleetWise::Vehicle</code></a>.
 
@@ -123,31 +149,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vehicles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, DecoderManifestArn, ModelManifestArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vehicles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vehicles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vehicles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vehicles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +188,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vehicle</code>.
 ```sql
 SELECT
@@ -173,6 +214,19 @@ state_templates
 FROM awscc.iotfleetwise.vehicles
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vehicles</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.iotfleetwise.vehicles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -265,6 +319,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotfleetwise.vehicles
+SET data__PatchDocument = string('{{ {
+    "AssociationBehavior": association_behavior,
+    "Attributes": attributes,
+    "DecoderManifestArn": decoder_manifest_arn,
+    "ModelManifestArn": model_manifest_arn,
+    "Tags": tags,
+    "StateTemplates": state_templates
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotfleetwise/vehicles_list_only/index.md b/website/docs/services/iotfleetwise/vehicles_list_only/index.md
deleted file mode 100644
index 5617e7951..000000000
--- a/website/docs/services/iotfleetwise/vehicles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vehicles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vehicles_list_only
-  - iotfleetwise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vehicles</code> in a region or regions, for all properties use <a href="/services/iotfleetwise/vehicles/"><code>vehicles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vehicles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::IoTFleetWise::Vehicle Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotfleetwise.vehicles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vehicles</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.iotfleetwise.vehicles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vehicles_list_only</code> resource, see <a href="/services/iotfleetwise/vehicles/#permissions"><code>vehicles</code></a>
-
diff --git a/website/docs/services/iotsitewise/access_policies/index.md b/website/docs/services/iotsitewise/access_policies/index.md
index 82b5c34e3..8fcba7506 100644
--- a/website/docs/services/iotsitewise/access_policies/index.md
+++ b/website/docs/services/iotsitewise/access_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>access_policy</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "access_policy_id",
@@ -260,6 +269,23 @@ Creates, updates, deletes or gets an <code>access_policy</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "access_policy_id",
+    "type": "string",
+    "description": "The ID of the access policy."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-accesspolicy.html"><code>AWS::IoTSiteWise::AccessPolicy</code></a>.
 
@@ -269,31 +295,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>access_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AccessPolicyIdentity, AccessPolicyPermission, AccessPolicyResource, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>access_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>access_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>access_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>access_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -302,6 +334,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>access_policy</code>.
 ```sql
 SELECT
@@ -314,6 +355,19 @@ access_policy_resource
 FROM awscc.iotsitewise.access_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<AccessPolicyId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>access_policies</code> in a region.
+```sql
+SELECT
+region,
+access_policy_id
+FROM awscc.iotsitewise.access_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -415,6 +469,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotsitewise.access_policies
+SET data__PatchDocument = string('{{ {
+    "AccessPolicyIdentity": access_policy_identity,
+    "AccessPolicyPermission": access_policy_permission,
+    "AccessPolicyResource": access_policy_resource
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccessPolicyId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotsitewise/access_policies_list_only/index.md b/website/docs/services/iotsitewise/access_policies_list_only/index.md
deleted file mode 100644
index de4862d42..000000000
--- a/website/docs/services/iotsitewise/access_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: access_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - access_policies_list_only
-  - iotsitewise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>access_policies</code> in a region or regions, for all properties use <a href="/services/iotsitewise/access_policies/"><code>access_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>access_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::IoTSiteWise::AccessPolicy</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotsitewise.access_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "access_policy_id",
-    "type": "string",
-    "description": "The ID of the access policy."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>access_policies</code> in a region.
-```sql
-SELECT
-region,
-access_policy_id
-FROM awscc.iotsitewise.access_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>access_policies_list_only</code> resource, see <a href="/services/iotsitewise/access_policies/#permissions"><code>access_policies</code></a>
-
diff --git a/website/docs/services/iotsitewise/asset_models/index.md b/website/docs/services/iotsitewise/asset_models/index.md
index 483b0de09..69f73e519 100644
--- a/website/docs/services/iotsitewise/asset_models/index.md
+++ b/website/docs/services/iotsitewise/asset_models/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>asset_model</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "asset_model_id",
@@ -310,6 +319,23 @@ Creates, updates, deletes or gets an <code>asset_model</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "asset_model_id",
+    "type": "string",
+    "description": "The ID of the asset model."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-assetmodel.html"><code>AWS::IoTSiteWise::AssetModel</code></a>.
 
@@ -319,31 +345,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>asset_models</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AssetModelName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>asset_models</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>asset_models</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>asset_models_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>asset_models</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -352,6 +384,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>asset_model</code>.
 ```sql
 SELECT
@@ -370,6 +411,19 @@ tags
 FROM awscc.iotsitewise.asset_models
 WHERE region = 'us-east-1' AND data__Identifier = '<AssetModelId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>asset_models</code> in a region.
+```sql
+SELECT
+region,
+asset_model_id
+FROM awscc.iotsitewise.asset_models_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -517,6 +571,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotsitewise.asset_models
+SET data__PatchDocument = string('{{ {
+    "AssetModelExternalId": asset_model_external_id,
+    "AssetModelName": asset_model_name,
+    "AssetModelDescription": asset_model_description,
+    "EnforcedAssetModelInterfaceRelationships": enforced_asset_model_interface_relationships,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AssetModelId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotsitewise/asset_models_list_only/index.md b/website/docs/services/iotsitewise/asset_models_list_only/index.md
deleted file mode 100644
index a1ece1573..000000000
--- a/website/docs/services/iotsitewise/asset_models_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: asset_models_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - asset_models_list_only
-  - iotsitewise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>asset_models</code> in a region or regions, for all properties use <a href="/services/iotsitewise/asset_models/"><code>asset_models</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>asset_models_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::IoTSiteWise::AssetModel</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotsitewise.asset_models_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "asset_model_id",
-    "type": "string",
-    "description": "The ID of the asset model."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>asset_models</code> in a region.
-```sql
-SELECT
-region,
-asset_model_id
-FROM awscc.iotsitewise.asset_models_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>asset_models_list_only</code> resource, see <a href="/services/iotsitewise/asset_models/#permissions"><code>asset_models</code></a>
-
diff --git a/website/docs/services/iotsitewise/assets/index.md b/website/docs/services/iotsitewise/assets/index.md
index d3a2d5a1f..c93e677b0 100644
--- a/website/docs/services/iotsitewise/assets/index.md
+++ b/website/docs/services/iotsitewise/assets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>asset</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "asset_id",
@@ -151,6 +160,23 @@ Creates, updates, deletes or gets an <code>asset</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "asset_id",
+    "type": "string",
+    "description": "The ID of the asset"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-asset.html"><code>AWS::IoTSiteWise::Asset</code></a>.
 
@@ -160,31 +186,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>assets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AssetName, AssetModelId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>assets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>assets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>assets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>assets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -193,6 +225,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>asset</code>.
 ```sql
 SELECT
@@ -209,6 +250,19 @@ tags
 FROM awscc.iotsitewise.assets
 WHERE region = 'us-east-1' AND data__Identifier = '<AssetId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>assets</code> in a region.
+```sql
+SELECT
+region,
+asset_id
+FROM awscc.iotsitewise.assets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -307,6 +361,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotsitewise.assets
+SET data__PatchDocument = string('{{ {
+    "AssetExternalId": asset_external_id,
+    "AssetModelId": asset_model_id,
+    "AssetName": asset_name,
+    "AssetDescription": asset_description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AssetId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotsitewise/assets_list_only/index.md b/website/docs/services/iotsitewise/assets_list_only/index.md
deleted file mode 100644
index f9aa71772..000000000
--- a/website/docs/services/iotsitewise/assets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: assets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - assets_list_only
-  - iotsitewise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>assets</code> in a region or regions, for all properties use <a href="/services/iotsitewise/assets/"><code>assets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>assets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::IoTSiteWise::Asset</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotsitewise.assets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "asset_id",
-    "type": "string",
-    "description": "The ID of the asset"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>assets</code> in a region.
-```sql
-SELECT
-region,
-asset_id
-FROM awscc.iotsitewise.assets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>assets_list_only</code> resource, see <a href="/services/iotsitewise/assets/#permissions"><code>assets</code></a>
-
diff --git a/website/docs/services/iotsitewise/computation_models/index.md b/website/docs/services/iotsitewise/computation_models/index.md
index 4c577839a..83252ad87 100644
--- a/website/docs/services/iotsitewise/computation_models/index.md
+++ b/website/docs/services/iotsitewise/computation_models/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>computation_model</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "computation_model_id",
@@ -106,6 +115,23 @@ Creates, updates, deletes or gets a <code>computation_model</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "computation_model_id",
+    "type": "string",
+    "description": "The ID of the computation model."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-computationmodel.html"><code>AWS::IoTSiteWise::ComputationModel</code></a>.
 
@@ -115,31 +141,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>computation_models</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ComputationModelName, ComputationModelConfiguration, ComputationModelDataBinding, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>computation_models</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>computation_models</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>computation_models_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>computation_models</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -148,6 +180,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>computation_model</code>.
 ```sql
 SELECT
@@ -162,6 +203,19 @@ tags
 FROM awscc.iotsitewise.computation_models
 WHERE region = 'us-east-1' AND data__Identifier = '<ComputationModelId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>computation_models</code> in a region.
+```sql
+SELECT
+region,
+computation_model_id
+FROM awscc.iotsitewise.computation_models_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -247,6 +301,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotsitewise.computation_models
+SET data__PatchDocument = string('{{ {
+    "ComputationModelName": computation_model_name,
+    "ComputationModelDescription": computation_model_description,
+    "ComputationModelConfiguration": computation_model_configuration,
+    "ComputationModelDataBinding": computation_model_data_binding,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ComputationModelId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotsitewise/computation_models_list_only/index.md b/website/docs/services/iotsitewise/computation_models_list_only/index.md
deleted file mode 100644
index 39b97ea69..000000000
--- a/website/docs/services/iotsitewise/computation_models_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: computation_models_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - computation_models_list_only
-  - iotsitewise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>computation_models</code> in a region or regions, for all properties use <a href="/services/iotsitewise/computation_models/"><code>computation_models</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>computation_models_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::IoTSiteWise::ComputationModel.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotsitewise.computation_models_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "computation_model_id",
-    "type": "string",
-    "description": "The ID of the computation model."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>computation_models</code> in a region.
-```sql
-SELECT
-region,
-computation_model_id
-FROM awscc.iotsitewise.computation_models_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>computation_models_list_only</code> resource, see <a href="/services/iotsitewise/computation_models/#permissions"><code>computation_models</code></a>
-
diff --git a/website/docs/services/iotsitewise/dashboards/index.md b/website/docs/services/iotsitewise/dashboards/index.md
index f47cad648..fe76ccf16 100644
--- a/website/docs/services/iotsitewise/dashboards/index.md
+++ b/website/docs/services/iotsitewise/dashboards/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>dashboard</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "project_id",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>dashboard</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "dashboard_id",
+    "type": "string",
+    "description": "The ID of the dashboard."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-dashboard.html"><code>AWS::IoTSiteWise::Dashboard</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DashboardDefinition, DashboardDescription, DashboardName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>dashboards_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dashboard</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.iotsitewise.dashboards
 WHERE region = 'us-east-1' AND data__Identifier = '<DashboardId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>dashboards</code> in a region.
+```sql
+SELECT
+region,
+dashboard_id
+FROM awscc.iotsitewise.dashboards_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -225,6 +279,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotsitewise.dashboards
+SET data__PatchDocument = string('{{ {
+    "DashboardName": dashboard_name,
+    "DashboardDescription": dashboard_description,
+    "DashboardDefinition": dashboard_definition,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DashboardId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotsitewise/dashboards_list_only/index.md b/website/docs/services/iotsitewise/dashboards_list_only/index.md
deleted file mode 100644
index 3f5e64e25..000000000
--- a/website/docs/services/iotsitewise/dashboards_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: dashboards_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - dashboards_list_only
-  - iotsitewise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>dashboards</code> in a region or regions, for all properties use <a href="/services/iotsitewise/dashboards/"><code>dashboards</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>dashboards_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::IoTSiteWise::Dashboard</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotsitewise.dashboards_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "dashboard_id",
-    "type": "string",
-    "description": "The ID of the dashboard."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>dashboards</code> in a region.
-```sql
-SELECT
-region,
-dashboard_id
-FROM awscc.iotsitewise.dashboards_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>dashboards_list_only</code> resource, see <a href="/services/iotsitewise/dashboards/#permissions"><code>dashboards</code></a>
-
diff --git a/website/docs/services/iotsitewise/datasets/index.md b/website/docs/services/iotsitewise/datasets/index.md
index d55fe1bbc..c7b64c59d 100644
--- a/website/docs/services/iotsitewise/datasets/index.md
+++ b/website/docs/services/iotsitewise/datasets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>dataset</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "dataset_id",
@@ -118,6 +127,23 @@ Creates, updates, deletes or gets a <code>dataset</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "dataset_id",
+    "type": "string",
+    "description": "The ID of the dataset."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-dataset.html"><code>AWS::IoTSiteWise::Dataset</code></a>.
 
@@ -127,31 +153,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DatasetName, DatasetSource, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>datasets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -160,6 +192,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dataset</code>.
 ```sql
 SELECT
@@ -173,6 +214,19 @@ tags
 FROM awscc.iotsitewise.datasets
 WHERE region = 'us-east-1' AND data__Identifier = '<DatasetId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>datasets</code> in a region.
+```sql
+SELECT
+region,
+dataset_id
+FROM awscc.iotsitewise.datasets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -255,6 +309,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotsitewise.datasets
+SET data__PatchDocument = string('{{ {
+    "DatasetName": dataset_name,
+    "DatasetDescription": dataset_description,
+    "DatasetSource": dataset_source,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DatasetId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotsitewise/datasets_list_only/index.md b/website/docs/services/iotsitewise/datasets_list_only/index.md
deleted file mode 100644
index f0c6e2c7f..000000000
--- a/website/docs/services/iotsitewise/datasets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: datasets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - datasets_list_only
-  - iotsitewise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>datasets</code> in a region or regions, for all properties use <a href="/services/iotsitewise/datasets/"><code>datasets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>datasets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::IoTSiteWise::Dataset.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotsitewise.datasets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "dataset_id",
-    "type": "string",
-    "description": "The ID of the dataset."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>datasets</code> in a region.
-```sql
-SELECT
-region,
-dataset_id
-FROM awscc.iotsitewise.datasets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>datasets_list_only</code> resource, see <a href="/services/iotsitewise/datasets/#permissions"><code>datasets</code></a>
-
diff --git a/website/docs/services/iotsitewise/gateways/index.md b/website/docs/services/iotsitewise/gateways/index.md
index d0461143f..e046a5aa0 100644
--- a/website/docs/services/iotsitewise/gateways/index.md
+++ b/website/docs/services/iotsitewise/gateways/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>gateway</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "gateway_name",
@@ -125,6 +134,23 @@ Creates, updates, deletes or gets a <code>gateway</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "gateway_id",
+    "type": "string",
+    "description": "The ID of the gateway device."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-gateway.html"><code>AWS::IoTSiteWise::Gateway</code></a>.
 
@@ -134,31 +160,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>gateways</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GatewayName, GatewayPlatform, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>gateways</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>gateways</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>gateways_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>gateways</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -167,6 +199,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>gateway</code>.
 ```sql
 SELECT
@@ -180,6 +221,19 @@ gateway_capability_summaries
 FROM awscc.iotsitewise.gateways
 WHERE region = 'us-east-1' AND data__Identifier = '<GatewayId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>gateways</code> in a region.
+```sql
+SELECT
+region,
+gateway_id
+FROM awscc.iotsitewise.gateways_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -267,6 +321,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotsitewise.gateways
+SET data__PatchDocument = string('{{ {
+    "GatewayName": gateway_name,
+    "Tags": tags,
+    "GatewayCapabilitySummaries": gateway_capability_summaries
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<GatewayId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotsitewise/gateways_list_only/index.md b/website/docs/services/iotsitewise/gateways_list_only/index.md
deleted file mode 100644
index b37d4ac48..000000000
--- a/website/docs/services/iotsitewise/gateways_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: gateways_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - gateways_list_only
-  - iotsitewise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>gateways</code> in a region or regions, for all properties use <a href="/services/iotsitewise/gateways/"><code>gateways</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>gateways_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::IoTSiteWise::Gateway</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotsitewise.gateways_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "gateway_id",
-    "type": "string",
-    "description": "The ID of the gateway device."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>gateways</code> in a region.
-```sql
-SELECT
-region,
-gateway_id
-FROM awscc.iotsitewise.gateways_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>gateways_list_only</code> resource, see <a href="/services/iotsitewise/gateways/#permissions"><code>gateways</code></a>
-
diff --git a/website/docs/services/iotsitewise/index.md b/website/docs/services/iotsitewise/index.md
index 1b1caffb7..61a9c5a7c 100644
--- a/website/docs/services/iotsitewise/index.md
+++ b/website/docs/services/iotsitewise/index.md
@@ -20,7 +20,7 @@ The iotsitewise service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>18</b></span><br />
+<span>total resources:&nbsp;<b>9</b></span><br />
 </div>
 </div>
 
@@ -30,24 +30,15 @@ The iotsitewise service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/iotsitewise/access_policies/">access_policies</a><br />
-<a href="/services/iotsitewise/access_policies_list_only/">access_policies_list_only</a><br />
 <a href="/services/iotsitewise/asset_models/">asset_models</a><br />
-<a href="/services/iotsitewise/asset_models_list_only/">asset_models_list_only</a><br />
 <a href="/services/iotsitewise/assets/">assets</a><br />
-<a href="/services/iotsitewise/assets_list_only/">assets_list_only</a><br />
 <a href="/services/iotsitewise/computation_models/">computation_models</a><br />
-<a href="/services/iotsitewise/computation_models_list_only/">computation_models_list_only</a><br />
 <a href="/services/iotsitewise/dashboards/">dashboards</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/iotsitewise/dashboards_list_only/">dashboards_list_only</a><br />
 <a href="/services/iotsitewise/datasets/">datasets</a><br />
-<a href="/services/iotsitewise/datasets_list_only/">datasets_list_only</a><br />
 <a href="/services/iotsitewise/gateways/">gateways</a><br />
-<a href="/services/iotsitewise/gateways_list_only/">gateways_list_only</a><br />
 <a href="/services/iotsitewise/portals/">portals</a><br />
-<a href="/services/iotsitewise/portals_list_only/">portals_list_only</a><br />
-<a href="/services/iotsitewise/projects/">projects</a><br />
-<a href="/services/iotsitewise/projects_list_only/">projects_list_only</a>
+<a href="/services/iotsitewise/projects/">projects</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/iotsitewise/portals/index.md b/website/docs/services/iotsitewise/portals/index.md
index 1d85f93e3..a121fba9d 100644
--- a/website/docs/services/iotsitewise/portals/index.md
+++ b/website/docs/services/iotsitewise/portals/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>portal</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "portal_auth_mode",
@@ -134,6 +143,23 @@ Creates, updates, deletes or gets a <code>portal</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "portal_id",
+    "type": "string",
+    "description": "The ID of the portal."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-portal.html"><code>AWS::IoTSiteWise::Portal</code></a>.
 
@@ -143,31 +169,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>portals</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PortalContactEmail, PortalName, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>portals</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>portals</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>portals_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>portals</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -176,6 +208,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>portal</code>.
 ```sql
 SELECT
@@ -197,6 +238,19 @@ tags
 FROM awscc.iotsitewise.portals
 WHERE region = 'us-east-1' AND data__Identifier = '<PortalId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>portals</code> in a region.
+```sql
+SELECT
+region,
+portal_id
+FROM awscc.iotsitewise.portals_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -301,6 +355,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotsitewise.portals
+SET data__PatchDocument = string('{{ {
+    "PortalContactEmail": portal_contact_email,
+    "PortalDescription": portal_description,
+    "PortalName": portal_name,
+    "PortalTypeConfiguration": portal_type_configuration,
+    "RoleArn": role_arn,
+    "NotificationSenderEmail": notification_sender_email,
+    "Alarms": alarms,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PortalId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotsitewise/portals_list_only/index.md b/website/docs/services/iotsitewise/portals_list_only/index.md
deleted file mode 100644
index f98bc3bc7..000000000
--- a/website/docs/services/iotsitewise/portals_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: portals_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - portals_list_only
-  - iotsitewise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>portals</code> in a region or regions, for all properties use <a href="/services/iotsitewise/portals/"><code>portals</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>portals_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::IoTSiteWise::Portal</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotsitewise.portals_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "portal_id",
-    "type": "string",
-    "description": "The ID of the portal."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>portals</code> in a region.
-```sql
-SELECT
-region,
-portal_id
-FROM awscc.iotsitewise.portals_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>portals_list_only</code> resource, see <a href="/services/iotsitewise/portals/#permissions"><code>portals</code></a>
-
diff --git a/website/docs/services/iotsitewise/projects/index.md b/website/docs/services/iotsitewise/projects/index.md
index a4b050295..01820605b 100644
--- a/website/docs/services/iotsitewise/projects/index.md
+++ b/website/docs/services/iotsitewise/projects/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>project</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "portal_id",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>project</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "project_id",
+    "type": "string",
+    "description": "The ID of the project."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-project.html"><code>AWS::IoTSiteWise::Project</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PortalId, ProjectName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>projects_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>project</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.iotsitewise.projects
 WHERE region = 'us-east-1' AND data__Identifier = '<ProjectId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>projects</code> in a region.
+```sql
+SELECT
+region,
+project_id
+FROM awscc.iotsitewise.projects_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -224,6 +278,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotsitewise.projects
+SET data__PatchDocument = string('{{ {
+    "ProjectName": project_name,
+    "ProjectDescription": project_description,
+    "AssetIds": asset_ids,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ProjectId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotsitewise/projects_list_only/index.md b/website/docs/services/iotsitewise/projects_list_only/index.md
deleted file mode 100644
index 4922756c0..000000000
--- a/website/docs/services/iotsitewise/projects_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: projects_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - projects_list_only
-  - iotsitewise
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>projects</code> in a region or regions, for all properties use <a href="/services/iotsitewise/projects/"><code>projects</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>projects_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::IoTSiteWise::Project</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotsitewise.projects_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "project_id",
-    "type": "string",
-    "description": "The ID of the project."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>projects</code> in a region.
-```sql
-SELECT
-region,
-project_id
-FROM awscc.iotsitewise.projects_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>projects_list_only</code> resource, see <a href="/services/iotsitewise/projects/#permissions"><code>projects</code></a>
-
diff --git a/website/docs/services/iottwinmaker/component_types/index.md b/website/docs/services/iottwinmaker/component_types/index.md
index 7e749df3f..43a1d517b 100644
--- a/website/docs/services/iottwinmaker/component_types/index.md
+++ b/website/docs/services/iottwinmaker/component_types/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>component_type</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "workspace_id",
@@ -127,6 +136,28 @@ Creates, updates, deletes or gets a <code>component_type</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "workspace_id",
+    "type": "string",
+    "description": "The ID of the workspace that contains the component type."
+  },
+  {
+    "name": "component_type_id",
+    "type": "string",
+    "description": "The ID of the component type."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iottwinmaker-componenttype.html"><code>AWS::IoTTwinMaker::ComponentType</code></a>.
 
@@ -136,31 +167,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>component_types</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="WorkspaceId, ComponentTypeId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>component_types</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>component_types</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>component_types_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>component_types</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -169,6 +206,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>component_type</code>.
 ```sql
 SELECT
@@ -192,6 +238,20 @@ tags
 FROM awscc.iottwinmaker.component_types
 WHERE region = 'us-east-1' AND data__Identifier = '<WorkspaceId>|<ComponentTypeId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>component_types</code> in a region.
+```sql
+SELECT
+region,
+workspace_id,
+component_type_id
+FROM awscc.iottwinmaker.component_types_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -291,6 +351,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iottwinmaker.component_types
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "ExtendsFrom": extends_from,
+    "Functions": functions,
+    "IsSingleton": is_singleton,
+    "PropertyDefinitions": property_definitions,
+    "PropertyGroups": property_groups,
+    "CompositeComponentTypes": composite_component_types,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<WorkspaceId>|<ComponentTypeId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iottwinmaker/component_types_list_only/index.md b/website/docs/services/iottwinmaker/component_types_list_only/index.md
deleted file mode 100644
index 73f901e4e..000000000
--- a/website/docs/services/iottwinmaker/component_types_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: component_types_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - component_types_list_only
-  - iottwinmaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>component_types</code> in a region or regions, for all properties use <a href="/services/iottwinmaker/component_types/"><code>component_types</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>component_types_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::IoTTwinMaker::ComponentType</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iottwinmaker.component_types_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "workspace_id",
-    "type": "string",
-    "description": "The ID of the workspace that contains the component type."
-  },
-  {
-    "name": "component_type_id",
-    "type": "string",
-    "description": "The ID of the component type."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>component_types</code> in a region.
-```sql
-SELECT
-region,
-workspace_id,
-component_type_id
-FROM awscc.iottwinmaker.component_types_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>component_types_list_only</code> resource, see <a href="/services/iottwinmaker/component_types/#permissions"><code>component_types</code></a>
-
diff --git a/website/docs/services/iottwinmaker/entities/index.md b/website/docs/services/iottwinmaker/entities/index.md
index a713fec2d..f8bd00c37 100644
--- a/website/docs/services/iottwinmaker/entities/index.md
+++ b/website/docs/services/iottwinmaker/entities/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>entity</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "entity_id",
@@ -112,6 +121,28 @@ Creates, updates, deletes or gets an <code>entity</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "entity_id",
+    "type": "string",
+    "description": "The ID of the entity."
+  },
+  {
+    "name": "workspace_id",
+    "type": "string",
+    "description": "The ID of the workspace."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iottwinmaker-entity.html"><code>AWS::IoTTwinMaker::Entity</code></a>.
 
@@ -121,31 +152,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>entities</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="WorkspaceId, EntityName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>entities</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>entities</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>entities_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>entities</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -154,6 +191,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>entity</code>.
 ```sql
 SELECT
@@ -174,6 +220,20 @@ composite_components
 FROM awscc.iottwinmaker.entities
 WHERE region = 'us-east-1' AND data__Identifier = '<WorkspaceId>|<EntityId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>entities</code> in a region.
+```sql
+SELECT
+region,
+workspace_id,
+entity_id
+FROM awscc.iottwinmaker.entities_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -264,6 +324,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iottwinmaker.entities
+SET data__PatchDocument = string('{{ {
+    "EntityName": entity_name,
+    "ParentEntityId": parent_entity_id,
+    "Description": description,
+    "Tags": tags,
+    "Components": components,
+    "CompositeComponents": composite_components
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<WorkspaceId>|<EntityId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iottwinmaker/entities_list_only/index.md b/website/docs/services/iottwinmaker/entities_list_only/index.md
deleted file mode 100644
index 6d91aa691..000000000
--- a/website/docs/services/iottwinmaker/entities_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: entities_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - entities_list_only
-  - iottwinmaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>entities</code> in a region or regions, for all properties use <a href="/services/iottwinmaker/entities/"><code>entities</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>entities_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::IoTTwinMaker::Entity</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iottwinmaker.entities_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "entity_id",
-    "type": "string",
-    "description": "The ID of the entity."
-  },
-  {
-    "name": "workspace_id",
-    "type": "string",
-    "description": "The ID of the workspace."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>entities</code> in a region.
-```sql
-SELECT
-region,
-workspace_id,
-entity_id
-FROM awscc.iottwinmaker.entities_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>entities_list_only</code> resource, see <a href="/services/iottwinmaker/entities/#permissions"><code>entities</code></a>
-
diff --git a/website/docs/services/iottwinmaker/index.md b/website/docs/services/iottwinmaker/index.md
index 17eaafada..e0eba1179 100644
--- a/website/docs/services/iottwinmaker/index.md
+++ b/website/docs/services/iottwinmaker/index.md
@@ -20,7 +20,7 @@ The iottwinmaker service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>10</b></span><br />
+<span>total resources:&nbsp;<b>5</b></span><br />
 </div>
 </div>
 
@@ -30,16 +30,11 @@ The iottwinmaker service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/iottwinmaker/component_types/">component_types</a><br />
-<a href="/services/iottwinmaker/component_types_list_only/">component_types_list_only</a><br />
 <a href="/services/iottwinmaker/entities/">entities</a><br />
-<a href="/services/iottwinmaker/entities_list_only/">entities_list_only</a><br />
 <a href="/services/iottwinmaker/scenes/">scenes</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/iottwinmaker/scenes_list_only/">scenes_list_only</a><br />
 <a href="/services/iottwinmaker/sync_jobs/">sync_jobs</a><br />
-<a href="/services/iottwinmaker/sync_jobs_list_only/">sync_jobs_list_only</a><br />
-<a href="/services/iottwinmaker/workspaces/">workspaces</a><br />
-<a href="/services/iottwinmaker/workspaces_list_only/">workspaces_list_only</a>
+<a href="/services/iottwinmaker/workspaces/">workspaces</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/iottwinmaker/scenes/index.md b/website/docs/services/iottwinmaker/scenes/index.md
index 5ceef152b..955344b6d 100644
--- a/website/docs/services/iottwinmaker/scenes/index.md
+++ b/website/docs/services/iottwinmaker/scenes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>scene</code> resource or lists <code>s
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "scene_id",
@@ -90,6 +99,28 @@ Creates, updates, deletes or gets a <code>scene</code> resource or lists <code>s
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "scene_id",
+    "type": "string",
+    "description": "The ID of the scene."
+  },
+  {
+    "name": "workspace_id",
+    "type": "string",
+    "description": "The ID of the scene."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iottwinmaker-scene.html"><code>AWS::IoTTwinMaker::Scene</code></a>.
 
@@ -99,31 +130,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>scenes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="WorkspaceId, SceneId, ContentLocation, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>scenes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>scenes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>scenes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>scenes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -132,6 +169,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>scene</code>.
 ```sql
 SELECT
@@ -150,6 +196,20 @@ generated_scene_metadata
 FROM awscc.iottwinmaker.scenes
 WHERE region = 'us-east-1' AND data__Identifier = '<WorkspaceId>|<SceneId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>scenes</code> in a region.
+```sql
+SELECT
+region,
+workspace_id,
+scene_id
+FROM awscc.iottwinmaker.scenes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -239,6 +299,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iottwinmaker.scenes
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "ContentLocation": content_location,
+    "Tags": tags,
+    "Capabilities": capabilities,
+    "SceneMetadata": scene_metadata
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<WorkspaceId>|<SceneId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iottwinmaker/scenes_list_only/index.md b/website/docs/services/iottwinmaker/scenes_list_only/index.md
deleted file mode 100644
index 8690eac1b..000000000
--- a/website/docs/services/iottwinmaker/scenes_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: scenes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - scenes_list_only
-  - iottwinmaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>scenes</code> in a region or regions, for all properties use <a href="/services/iottwinmaker/scenes/"><code>scenes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>scenes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::IoTTwinMaker::Scene</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iottwinmaker.scenes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "scene_id",
-    "type": "string",
-    "description": "The ID of the scene."
-  },
-  {
-    "name": "workspace_id",
-    "type": "string",
-    "description": "The ID of the scene."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>scenes</code> in a region.
-```sql
-SELECT
-region,
-workspace_id,
-scene_id
-FROM awscc.iottwinmaker.scenes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>scenes_list_only</code> resource, see <a href="/services/iottwinmaker/scenes/#permissions"><code>scenes</code></a>
-
diff --git a/website/docs/services/iottwinmaker/sync_jobs/index.md b/website/docs/services/iottwinmaker/sync_jobs/index.md
index 981544c54..4b34a8905 100644
--- a/website/docs/services/iottwinmaker/sync_jobs/index.md
+++ b/website/docs/services/iottwinmaker/sync_jobs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>sync_job</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "workspace_id",
@@ -75,6 +84,28 @@ Creates, updates, deletes or gets a <code>sync_job</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "workspace_id",
+    "type": "string",
+    "description": "The ID of the workspace."
+  },
+  {
+    "name": "sync_source",
+    "type": "string",
+    "description": "The source of the SyncJob."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iottwinmaker-syncjob.html"><code>AWS::IoTTwinMaker::SyncJob</code></a>.
 
@@ -84,26 +115,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>sync_jobs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="WorkspaceId, SyncSource, SyncRole, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>sync_jobs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>sync_jobs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>sync_jobs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +148,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>sync_job</code>.
 ```sql
 SELECT
@@ -127,6 +172,20 @@ tags
 FROM awscc.iottwinmaker.sync_jobs
 WHERE region = 'us-east-1' AND data__Identifier = '<WorkspaceId>|<SyncSource>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>sync_jobs</code> in a region.
+```sql
+SELECT
+region,
+workspace_id,
+sync_source
+FROM awscc.iottwinmaker.sync_jobs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -203,6 +262,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iottwinmaker/sync_jobs_list_only/index.md b/website/docs/services/iottwinmaker/sync_jobs_list_only/index.md
deleted file mode 100644
index 11734d6ae..000000000
--- a/website/docs/services/iottwinmaker/sync_jobs_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: sync_jobs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - sync_jobs_list_only
-  - iottwinmaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>sync_jobs</code> in a region or regions, for all properties use <a href="/services/iottwinmaker/sync_jobs/"><code>sync_jobs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>sync_jobs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::IoTTwinMaker::SyncJob</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iottwinmaker.sync_jobs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "workspace_id",
-    "type": "string",
-    "description": "The ID of the workspace."
-  },
-  {
-    "name": "sync_source",
-    "type": "string",
-    "description": "The source of the SyncJob."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>sync_jobs</code> in a region.
-```sql
-SELECT
-region,
-workspace_id,
-sync_source
-FROM awscc.iottwinmaker.sync_jobs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>sync_jobs_list_only</code> resource, see <a href="/services/iottwinmaker/sync_jobs/#permissions"><code>sync_jobs</code></a>
-
diff --git a/website/docs/services/iottwinmaker/workspaces/index.md b/website/docs/services/iottwinmaker/workspaces/index.md
index 8ed20cad5..2a945c942 100644
--- a/website/docs/services/iottwinmaker/workspaces/index.md
+++ b/website/docs/services/iottwinmaker/workspaces/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>workspace</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "workspace_id",
@@ -75,6 +84,23 @@ Creates, updates, deletes or gets a <code>workspace</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "workspace_id",
+    "type": "string",
+    "description": "The ID of the workspace."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iottwinmaker-workspace.html"><code>AWS::IoTTwinMaker::Workspace</code></a>.
 
@@ -84,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>workspaces</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="WorkspaceId, Role, S3Location, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>workspaces</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>workspaces</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>workspaces_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>workspaces</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>workspace</code>.
 ```sql
 SELECT
@@ -132,6 +173,19 @@ tags
 FROM awscc.iottwinmaker.workspaces
 WHERE region = 'us-east-1' AND data__Identifier = '<WorkspaceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>workspaces</code> in a region.
+```sql
+SELECT
+region,
+workspace_id
+FROM awscc.iottwinmaker.workspaces_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -212,6 +266,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iottwinmaker.workspaces
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Role": role,
+    "S3Location": s3_location,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<WorkspaceId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iottwinmaker/workspaces_list_only/index.md b/website/docs/services/iottwinmaker/workspaces_list_only/index.md
deleted file mode 100644
index 424c809c9..000000000
--- a/website/docs/services/iottwinmaker/workspaces_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: workspaces_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - workspaces_list_only
-  - iottwinmaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>workspaces</code> in a region or regions, for all properties use <a href="/services/iottwinmaker/workspaces/"><code>workspaces</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>workspaces_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::IoTTwinMaker::Workspace</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iottwinmaker.workspaces_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "workspace_id",
-    "type": "string",
-    "description": "The ID of the workspace."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>workspaces</code> in a region.
-```sql
-SELECT
-region,
-workspace_id
-FROM awscc.iottwinmaker.workspaces_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>workspaces_list_only</code> resource, see <a href="/services/iottwinmaker/workspaces/#permissions"><code>workspaces</code></a>
-
diff --git a/website/docs/services/iotwireless/destinations/index.md b/website/docs/services/iotwireless/destinations/index.md
index af90c4ea4..9c4f8227d 100644
--- a/website/docs/services/iotwireless/destinations/index.md
+++ b/website/docs/services/iotwireless/destinations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>destination</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>destination</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Unique name of destination"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-destination.html"><code>AWS::IoTWireless::Destination</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>destinations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Expression, ExpressionType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>destinations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>destinations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>destinations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>destinations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>destination</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ arn
 FROM awscc.iotwireless.destinations
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>destinations</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.iotwireless.destinations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -229,6 +283,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotwireless.destinations
+SET data__PatchDocument = string('{{ {
+    "Expression": expression,
+    "ExpressionType": expression_type,
+    "Description": description,
+    "Tags": tags,
+    "RoleArn": role_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotwireless/destinations_list_only/index.md b/website/docs/services/iotwireless/destinations_list_only/index.md
deleted file mode 100644
index bc7770999..000000000
--- a/website/docs/services/iotwireless/destinations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: destinations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - destinations_list_only
-  - iotwireless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>destinations</code> in a region or regions, for all properties use <a href="/services/iotwireless/destinations/"><code>destinations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>destinations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Destination's resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotwireless.destinations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Unique name of destination"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>destinations</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.iotwireless.destinations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>destinations_list_only</code> resource, see <a href="/services/iotwireless/destinations/#permissions"><code>destinations</code></a>
-
diff --git a/website/docs/services/iotwireless/device_profiles/index.md b/website/docs/services/iotwireless/device_profiles/index.md
index fad8bb587..4f85a94f8 100644
--- a/website/docs/services/iotwireless/device_profiles/index.md
+++ b/website/docs/services/iotwireless/device_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>device_profile</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -174,6 +183,23 @@ Creates, updates, deletes or gets a <code>device_profile</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Service profile Id. Returned after successful create."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-deviceprofile.html"><code>AWS::IoTWireless::DeviceProfile</code></a>.
 
@@ -183,31 +209,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>device_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>device_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>device_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>device_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>device_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -216,6 +248,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>device_profile</code>.
 ```sql
 SELECT
@@ -228,6 +269,19 @@ id
 FROM awscc.iotwireless.device_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>device_profiles</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.iotwireless.device_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -318,6 +372,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotwireless.device_profiles
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotwireless/device_profiles_list_only/index.md b/website/docs/services/iotwireless/device_profiles_list_only/index.md
deleted file mode 100644
index 0d0208dea..000000000
--- a/website/docs/services/iotwireless/device_profiles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: device_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - device_profiles_list_only
-  - iotwireless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>device_profiles</code> in a region or regions, for all properties use <a href="/services/iotwireless/device_profiles/"><code>device_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>device_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Device Profile's resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotwireless.device_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Service profile Id. Returned after successful create."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>device_profiles</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.iotwireless.device_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>device_profiles_list_only</code> resource, see <a href="/services/iotwireless/device_profiles/#permissions"><code>device_profiles</code></a>
-
diff --git a/website/docs/services/iotwireless/fuota_tasks/index.md b/website/docs/services/iotwireless/fuota_tasks/index.md
index 99495b688..ec31d087a 100644
--- a/website/docs/services/iotwireless/fuota_tasks/index.md
+++ b/website/docs/services/iotwireless/fuota_tasks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>fuota_task</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -139,6 +148,23 @@ Creates, updates, deletes or gets a <code>fuota_task</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "FUOTA task id. Returned after successful create."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-fuotatask.html"><code>AWS::IoTWireless::FuotaTask</code></a>.
 
@@ -148,31 +174,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>fuota_tasks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LoRaWAN, FirmwareUpdateImage, FirmwareUpdateRole, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>fuota_tasks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>fuota_tasks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>fuota_tasks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>fuota_tasks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -181,6 +213,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>fuota_task</code>.
 ```sql
 SELECT
@@ -201,6 +242,19 @@ disassociate_multicast_group
 FROM awscc.iotwireless.fuota_tasks
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>fuota_tasks</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.iotwireless.fuota_tasks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -307,6 +361,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotwireless.fuota_tasks
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "FirmwareUpdateImage": firmware_update_image,
+    "FirmwareUpdateRole": firmware_update_role,
+    "Tags": tags,
+    "AssociateWirelessDevice": associate_wireless_device,
+    "DisassociateWirelessDevice": disassociate_wireless_device,
+    "AssociateMulticastGroup": associate_multicast_group,
+    "DisassociateMulticastGroup": disassociate_multicast_group
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotwireless/fuota_tasks_list_only/index.md b/website/docs/services/iotwireless/fuota_tasks_list_only/index.md
deleted file mode 100644
index daa8105bc..000000000
--- a/website/docs/services/iotwireless/fuota_tasks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: fuota_tasks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - fuota_tasks_list_only
-  - iotwireless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>fuota_tasks</code> in a region or regions, for all properties use <a href="/services/iotwireless/fuota_tasks/"><code>fuota_tasks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>fuota_tasks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Create and manage FUOTA tasks.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotwireless.fuota_tasks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "FUOTA task id. Returned after successful create."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>fuota_tasks</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.iotwireless.fuota_tasks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>fuota_tasks_list_only</code> resource, see <a href="/services/iotwireless/fuota_tasks/#permissions"><code>fuota_tasks</code></a>
-
diff --git a/website/docs/services/iotwireless/index.md b/website/docs/services/iotwireless/index.md
index 97e18206d..e9f2000ef 100644
--- a/website/docs/services/iotwireless/index.md
+++ b/website/docs/services/iotwireless/index.md
@@ -20,7 +20,7 @@ The iotwireless service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>22</b></span><br />
+<span>total resources:&nbsp;<b>11</b></span><br />
 </div>
 </div>
 
@@ -30,28 +30,17 @@ The iotwireless service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/iotwireless/destinations/">destinations</a><br />
-<a href="/services/iotwireless/destinations_list_only/">destinations_list_only</a><br />
 <a href="/services/iotwireless/device_profiles/">device_profiles</a><br />
-<a href="/services/iotwireless/device_profiles_list_only/">device_profiles_list_only</a><br />
 <a href="/services/iotwireless/fuota_tasks/">fuota_tasks</a><br />
-<a href="/services/iotwireless/fuota_tasks_list_only/">fuota_tasks_list_only</a><br />
 <a href="/services/iotwireless/multicast_groups/">multicast_groups</a><br />
-<a href="/services/iotwireless/multicast_groups_list_only/">multicast_groups_list_only</a><br />
 <a href="/services/iotwireless/network_analyzer_configurations/">network_analyzer_configurations</a><br />
-<a href="/services/iotwireless/network_analyzer_configurations_list_only/">network_analyzer_configurations_list_only</a><br />
 <a href="/services/iotwireless/partner_accounts/">partner_accounts</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/iotwireless/partner_accounts_list_only/">partner_accounts_list_only</a><br />
 <a href="/services/iotwireless/service_profiles/">service_profiles</a><br />
-<a href="/services/iotwireless/service_profiles_list_only/">service_profiles_list_only</a><br />
 <a href="/services/iotwireless/task_definitions/">task_definitions</a><br />
-<a href="/services/iotwireless/task_definitions_list_only/">task_definitions_list_only</a><br />
 <a href="/services/iotwireless/wireless_device_import_tasks/">wireless_device_import_tasks</a><br />
-<a href="/services/iotwireless/wireless_device_import_tasks_list_only/">wireless_device_import_tasks_list_only</a><br />
 <a href="/services/iotwireless/wireless_devices/">wireless_devices</a><br />
-<a href="/services/iotwireless/wireless_devices_list_only/">wireless_devices_list_only</a><br />
-<a href="/services/iotwireless/wireless_gateways/">wireless_gateways</a><br />
-<a href="/services/iotwireless/wireless_gateways_list_only/">wireless_gateways_list_only</a>
+<a href="/services/iotwireless/wireless_gateways/">wireless_gateways</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/iotwireless/multicast_groups/index.md b/website/docs/services/iotwireless/multicast_groups/index.md
index f44cbe573..1162556f9 100644
--- a/website/docs/services/iotwireless/multicast_groups/index.md
+++ b/website/docs/services/iotwireless/multicast_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>multicast_group</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -119,6 +128,23 @@ Creates, updates, deletes or gets a <code>multicast_group</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Multicast group id. Returned after successful create."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-multicastgroup.html"><code>AWS::IoTWireless::MulticastGroup</code></a>.
 
@@ -128,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>multicast_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LoRaWAN, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>multicast_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>multicast_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>multicast_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>multicast_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>multicast_group</code>.
 ```sql
 SELECT
@@ -177,6 +218,19 @@ disassociate_wireless_device
 FROM awscc.iotwireless.multicast_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>multicast_groups</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.iotwireless.multicast_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -263,6 +317,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotwireless.multicast_groups
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "Tags": tags,
+    "AssociateWirelessDevice": associate_wireless_device,
+    "DisassociateWirelessDevice": disassociate_wireless_device
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotwireless/multicast_groups_list_only/index.md b/website/docs/services/iotwireless/multicast_groups_list_only/index.md
deleted file mode 100644
index d6fb0e41d..000000000
--- a/website/docs/services/iotwireless/multicast_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: multicast_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - multicast_groups_list_only
-  - iotwireless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>multicast_groups</code> in a region or regions, for all properties use <a href="/services/iotwireless/multicast_groups/"><code>multicast_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>multicast_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Create and manage Multicast groups.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotwireless.multicast_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Multicast group id. Returned after successful create."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>multicast_groups</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.iotwireless.multicast_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>multicast_groups_list_only</code> resource, see <a href="/services/iotwireless/multicast_groups/#permissions"><code>multicast_groups</code></a>
-
diff --git a/website/docs/services/iotwireless/network_analyzer_configurations/index.md b/website/docs/services/iotwireless/network_analyzer_configurations/index.md
index 4dba9d9a0..156023793 100644
--- a/website/docs/services/iotwireless/network_analyzer_configurations/index.md
+++ b/website/docs/services/iotwireless/network_analyzer_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>network_analyzer_configuration</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -99,6 +108,23 @@ Creates, updates, deletes or gets a <code>network_analyzer_configuration</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Name of the network analyzer configuration"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-networkanalyzerconfiguration.html"><code>AWS::IoTWireless::NetworkAnalyzerConfiguration</code></a>.
 
@@ -108,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>network_analyzer_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>network_analyzer_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>network_analyzer_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>network_analyzer_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>network_analyzer_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>network_analyzer_configuration</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ tags
 FROM awscc.iotwireless.network_analyzer_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>network_analyzer_configurations</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.iotwireless.network_analyzer_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -241,6 +295,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotwireless.network_analyzer_configurations
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "TraceContent": trace_content,
+    "WirelessDevices": wireless_devices,
+    "WirelessGateways": wireless_gateways,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotwireless/network_analyzer_configurations_list_only/index.md b/website/docs/services/iotwireless/network_analyzer_configurations_list_only/index.md
deleted file mode 100644
index b445ff7fb..000000000
--- a/website/docs/services/iotwireless/network_analyzer_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: network_analyzer_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - network_analyzer_configurations_list_only
-  - iotwireless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>network_analyzer_configurations</code> in a region or regions, for all properties use <a href="/services/iotwireless/network_analyzer_configurations/"><code>network_analyzer_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>network_analyzer_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Create and manage NetworkAnalyzerConfiguration resource.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotwireless.network_analyzer_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Name of the network analyzer configuration"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>network_analyzer_configurations</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.iotwireless.network_analyzer_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>network_analyzer_configurations_list_only</code> resource, see <a href="/services/iotwireless/network_analyzer_configurations/#permissions"><code>network_analyzer_configurations</code></a>
-
diff --git a/website/docs/services/iotwireless/partner_accounts/index.md b/website/docs/services/iotwireless/partner_accounts/index.md
index 8bd19002b..3593742f5 100644
--- a/website/docs/services/iotwireless/partner_accounts/index.md
+++ b/website/docs/services/iotwireless/partner_accounts/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>partner_account</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "sidewalk",
@@ -128,6 +137,23 @@ Creates, updates, deletes or gets a <code>partner_account</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "partner_account_id",
+    "type": "string",
+    "description": "The partner account ID to disassociate from the AWS account"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-partneraccount.html"><code>AWS::IoTWireless::PartnerAccount</code></a>.
 
@@ -137,31 +163,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>partner_accounts</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>partner_accounts</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>partner_accounts</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>partner_accounts_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>partner_accounts</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -170,6 +202,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>partner_account</code>.
 ```sql
 SELECT
@@ -186,6 +227,19 @@ tags
 FROM awscc.iotwireless.partner_accounts
 WHERE region = 'us-east-1' AND data__Identifier = '<PartnerAccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>partner_accounts</code> in a region.
+```sql
+SELECT
+region,
+partner_account_id
+FROM awscc.iotwireless.partner_accounts_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -289,6 +343,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotwireless.partner_accounts
+SET data__PatchDocument = string('{{ {
+    "Sidewalk": sidewalk,
+    "PartnerType": partner_type,
+    "SidewalkResponse": sidewalk_response,
+    "AccountLinked": account_linked,
+    "SidewalkUpdate": sidewalk_update,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PartnerAccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotwireless/partner_accounts_list_only/index.md b/website/docs/services/iotwireless/partner_accounts_list_only/index.md
deleted file mode 100644
index 71fc6c436..000000000
--- a/website/docs/services/iotwireless/partner_accounts_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: partner_accounts_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - partner_accounts_list_only
-  - iotwireless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>partner_accounts</code> in a region or regions, for all properties use <a href="/services/iotwireless/partner_accounts/"><code>partner_accounts</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>partner_accounts_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Create and manage partner account</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotwireless.partner_accounts_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "partner_account_id",
-    "type": "string",
-    "description": "The partner account ID to disassociate from the AWS account"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>partner_accounts</code> in a region.
-```sql
-SELECT
-region,
-partner_account_id
-FROM awscc.iotwireless.partner_accounts_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>partner_accounts_list_only</code> resource, see <a href="/services/iotwireless/partner_accounts/#permissions"><code>partner_accounts</code></a>
-
diff --git a/website/docs/services/iotwireless/service_profiles/index.md b/website/docs/services/iotwireless/service_profiles/index.md
index a20f4e180..0c3a08589 100644
--- a/website/docs/services/iotwireless/service_profiles/index.md
+++ b/website/docs/services/iotwireless/service_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>service_profile</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -174,6 +183,23 @@ Creates, updates, deletes or gets a <code>service_profile</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Service profile Id. Returned after successful create."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-serviceprofile.html"><code>AWS::IoTWireless::ServiceProfile</code></a>.
 
@@ -183,31 +209,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>service_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>service_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>service_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>service_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>service_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -216,6 +248,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>service_profile</code>.
 ```sql
 SELECT
@@ -228,6 +269,19 @@ id
 FROM awscc.iotwireless.service_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>service_profiles</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.iotwireless.service_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -317,6 +371,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotwireless.service_profiles
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotwireless/service_profiles_list_only/index.md b/website/docs/services/iotwireless/service_profiles_list_only/index.md
deleted file mode 100644
index e27f1d634..000000000
--- a/website/docs/services/iotwireless/service_profiles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: service_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - service_profiles_list_only
-  - iotwireless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>service_profiles</code> in a region or regions, for all properties use <a href="/services/iotwireless/service_profiles/"><code>service_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>service_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An example resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotwireless.service_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Service profile Id. Returned after successful create."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>service_profiles</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.iotwireless.service_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>service_profiles_list_only</code> resource, see <a href="/services/iotwireless/service_profiles/#permissions"><code>service_profiles</code></a>
-
diff --git a/website/docs/services/iotwireless/task_definitions/index.md b/website/docs/services/iotwireless/task_definitions/index.md
index 82fa86482..d0b3d41cb 100644
--- a/website/docs/services/iotwireless/task_definitions/index.md
+++ b/website/docs/services/iotwireless/task_definitions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>task_definition</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -167,6 +176,23 @@ Creates, updates, deletes or gets a <code>task_definition</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the new wireless gateway task definition"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-taskdefinition.html"><code>AWS::IoTWireless::TaskDefinition</code></a>.
 
@@ -176,31 +202,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>task_definitions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AutoCreateTasks, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>task_definitions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>task_definitions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>task_definitions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>task_definitions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -209,6 +241,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>task_definition</code>.
 ```sql
 SELECT
@@ -224,6 +265,19 @@ tags
 FROM awscc.iotwireless.task_definitions
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>task_definitions</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.iotwireless.task_definitions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -318,6 +372,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotwireless.task_definitions
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "AutoCreateTasks": auto_create_tasks,
+    "Update": update,
+    "LoRaWANUpdateGatewayTaskEntry": lo_ra_wan_update_gateway_task_entry,
+    "TaskDefinitionType": task_definition_type,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotwireless/task_definitions_list_only/index.md b/website/docs/services/iotwireless/task_definitions_list_only/index.md
deleted file mode 100644
index ade974a70..000000000
--- a/website/docs/services/iotwireless/task_definitions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: task_definitions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - task_definitions_list_only
-  - iotwireless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>task_definitions</code> in a region or regions, for all properties use <a href="/services/iotwireless/task_definitions/"><code>task_definitions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>task_definitions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a gateway task definition.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotwireless.task_definitions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the new wireless gateway task definition"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>task_definitions</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.iotwireless.task_definitions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>task_definitions_list_only</code> resource, see <a href="/services/iotwireless/task_definitions/#permissions"><code>task_definitions</code></a>
-
diff --git a/website/docs/services/iotwireless/wireless_device_import_tasks/index.md b/website/docs/services/iotwireless/wireless_device_import_tasks/index.md
index f5a148783..340eedb0b 100644
--- a/website/docs/services/iotwireless/wireless_device_import_tasks/index.md
+++ b/website/docs/services/iotwireless/wireless_device_import_tasks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>wireless_device_import_task</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -134,6 +143,23 @@ Creates, updates, deletes or gets a <code>wireless_device_import_task</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Id for Wireless Device Import Task, Returned upon successful start."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessdeviceimporttask.html"><code>AWS::IoTWireless::WirelessDeviceImportTask</code></a>.
 
@@ -143,31 +169,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>wireless_device_import_tasks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DestinationName, Sidewalk, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>wireless_device_import_tasks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>wireless_device_import_tasks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>wireless_device_import_tasks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>wireless_device_import_tasks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -176,6 +208,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>wireless_device_import_task</code>.
 ```sql
 SELECT
@@ -195,6 +236,19 @@ tags
 FROM awscc.iotwireless.wireless_device_import_tasks
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>wireless_device_import_tasks</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.iotwireless.wireless_device_import_tasks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -272,6 +326,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotwireless.wireless_device_import_tasks
+SET data__PatchDocument = string('{{ {
+    "DestinationName": destination_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotwireless/wireless_device_import_tasks_list_only/index.md b/website/docs/services/iotwireless/wireless_device_import_tasks_list_only/index.md
deleted file mode 100644
index 93eb48960..000000000
--- a/website/docs/services/iotwireless/wireless_device_import_tasks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: wireless_device_import_tasks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - wireless_device_import_tasks_list_only
-  - iotwireless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>wireless_device_import_tasks</code> in a region or regions, for all properties use <a href="/services/iotwireless/wireless_device_import_tasks/"><code>wireless_device_import_tasks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>wireless_device_import_tasks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Wireless Device Import Tasks</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotwireless.wireless_device_import_tasks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Id for Wireless Device Import Task, Returned upon successful start."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>wireless_device_import_tasks</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.iotwireless.wireless_device_import_tasks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>wireless_device_import_tasks_list_only</code> resource, see <a href="/services/iotwireless/wireless_device_import_tasks/#permissions"><code>wireless_device_import_tasks</code></a>
-
diff --git a/website/docs/services/iotwireless/wireless_devices/index.md b/website/docs/services/iotwireless/wireless_devices/index.md
index 2e40fd70b..a006c6364 100644
--- a/website/docs/services/iotwireless/wireless_devices/index.md
+++ b/website/docs/services/iotwireless/wireless_devices/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>wireless_device</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "type",
@@ -265,6 +274,23 @@ Creates, updates, deletes or gets a <code>wireless_device</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Wireless device Id. Returned after successful create."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessdevice.html"><code>AWS::IoTWireless::WirelessDevice</code></a>.
 
@@ -274,31 +300,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>wireless_devices</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, DestinationName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>wireless_devices</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>wireless_devices</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>wireless_devices_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>wireless_devices</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -307,6 +339,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>wireless_device</code>.
 ```sql
 SELECT
@@ -326,6 +367,19 @@ positioning
 FROM awscc.iotwireless.wireless_devices
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>wireless_devices</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.iotwireless.wireless_devices_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -449,6 +503,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotwireless.wireless_devices
+SET data__PatchDocument = string('{{ {
+    "Type": type,
+    "Name": name,
+    "Description": description,
+    "DestinationName": destination_name,
+    "LoRaWAN": lo_ra_wan,
+    "Tags": tags,
+    "ThingArn": thing_arn,
+    "LastUplinkReceivedAt": last_uplink_received_at,
+    "Positioning": positioning
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotwireless/wireless_devices_list_only/index.md b/website/docs/services/iotwireless/wireless_devices_list_only/index.md
deleted file mode 100644
index 407758832..000000000
--- a/website/docs/services/iotwireless/wireless_devices_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: wireless_devices_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - wireless_devices_list_only
-  - iotwireless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>wireless_devices</code> in a region or regions, for all properties use <a href="/services/iotwireless/wireless_devices/"><code>wireless_devices</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>wireless_devices_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Create and manage wireless gateways, including LoRa gateways.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotwireless.wireless_devices_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Wireless device Id. Returned after successful create."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>wireless_devices</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.iotwireless.wireless_devices_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>wireless_devices_list_only</code> resource, see <a href="/services/iotwireless/wireless_devices/#permissions"><code>wireless_devices</code></a>
-
diff --git a/website/docs/services/iotwireless/wireless_gateways/index.md b/website/docs/services/iotwireless/wireless_gateways/index.md
index 76824a22d..662e82a43 100644
--- a/website/docs/services/iotwireless/wireless_gateways/index.md
+++ b/website/docs/services/iotwireless/wireless_gateways/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>wireless_gateway</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -109,6 +118,23 @@ Creates, updates, deletes or gets a <code>wireless_gateway</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Id for Wireless Gateway. Returned upon successful create."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessgateway.html"><code>AWS::IoTWireless::WirelessGateway</code></a>.
 
@@ -118,31 +144,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>wireless_gateways</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LoRaWAN, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>wireless_gateways</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>wireless_gateways</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>wireless_gateways_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>wireless_gateways</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +183,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>wireless_gateway</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ last_uplink_received_at
 FROM awscc.iotwireless.wireless_gateways
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>wireless_gateways</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.iotwireless.wireless_gateways_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -255,6 +309,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.iotwireless.wireless_gateways
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "Tags": tags,
+    "LoRaWAN": lo_ra_wan,
+    "ThingArn": thing_arn,
+    "ThingName": thing_name,
+    "LastUplinkReceivedAt": last_uplink_received_at
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/iotwireless/wireless_gateways_list_only/index.md b/website/docs/services/iotwireless/wireless_gateways_list_only/index.md
deleted file mode 100644
index f4c9933e1..000000000
--- a/website/docs/services/iotwireless/wireless_gateways_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: wireless_gateways_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - wireless_gateways_list_only
-  - iotwireless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>wireless_gateways</code> in a region or regions, for all properties use <a href="/services/iotwireless/wireless_gateways/"><code>wireless_gateways</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>wireless_gateways_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Create and manage wireless gateways, including LoRa gateways.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotwireless.wireless_gateways_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Id for Wireless Gateway. Returned upon successful create."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>wireless_gateways</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.iotwireless.wireless_gateways_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>wireless_gateways_list_only</code> resource, see <a href="/services/iotwireless/wireless_gateways/#permissions"><code>wireless_gateways</code></a>
-
diff --git a/website/docs/services/ivs/channels/index.md b/website/docs/services/ivs/channels/index.md
index cfc64ce04..944318502 100644
--- a/website/docs/services/ivs/channels/index.md
+++ b/website/docs/services/ivs/channels/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>channel</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -134,6 +143,23 @@ Creates, updates, deletes or gets a <code>channel</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Channel ARN is automatically generated on creation and assigned as the unique identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-channel.html"><code>AWS::IVS::Channel</code></a>.
 
@@ -143,31 +169,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>channels_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -176,6 +208,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>channel</code>.
 ```sql
 SELECT
@@ -196,6 +237,19 @@ container_format
 FROM awscc.ivs.channels
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>channels</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ivs.channels_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -297,6 +351,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ivs.channels
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Authorized": authorized,
+    "InsecureIngest": insecure_ingest,
+    "LatencyMode": latency_mode,
+    "Type": type,
+    "Tags": tags,
+    "RecordingConfigurationArn": recording_configuration_arn,
+    "Preset": preset,
+    "MultitrackInputConfiguration": multitrack_input_configuration,
+    "ContainerFormat": container_format
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ivs/channels_list_only/index.md b/website/docs/services/ivs/channels_list_only/index.md
deleted file mode 100644
index 24f52177d..000000000
--- a/website/docs/services/ivs/channels_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: channels_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - channels_list_only
-  - ivs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>channels</code> in a region or regions, for all properties use <a href="/services/ivs/channels/"><code>channels</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>channels_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IVS::Channel</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ivs.channels_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Channel ARN is automatically generated on creation and assigned as the unique identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>channels</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ivs.channels_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>channels_list_only</code> resource, see <a href="/services/ivs/channels/#permissions"><code>channels</code></a>
-
diff --git a/website/docs/services/ivs/encoder_configurations/index.md b/website/docs/services/ivs/encoder_configurations/index.md
index 87212f07a..bd76a81fe 100644
--- a/website/docs/services/ivs/encoder_configurations/index.md
+++ b/website/docs/services/ivs/encoder_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>encoder_configuration</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets an <code>encoder_configuration</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Encoder configuration identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-encoderconfiguration.html"><code>AWS::IVS::EncoderConfiguration</code></a>.
 
@@ -103,31 +129,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>encoder_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>encoder_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>encoder_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>encoder_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>encoder_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>encoder_configuration</code>.
 ```sql
 SELECT
@@ -147,6 +188,19 @@ tags
 FROM awscc.ivs.encoder_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>encoder_configurations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ivs.encoder_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -221,6 +275,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ivs.encoder_configurations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ivs/encoder_configurations_list_only/index.md b/website/docs/services/ivs/encoder_configurations_list_only/index.md
deleted file mode 100644
index d9e30e5ff..000000000
--- a/website/docs/services/ivs/encoder_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: encoder_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - encoder_configurations_list_only
-  - ivs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>encoder_configurations</code> in a region or regions, for all properties use <a href="/services/ivs/encoder_configurations/"><code>encoder_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>encoder_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IVS::EncoderConfiguration.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ivs.encoder_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Encoder configuration identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>encoder_configurations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ivs.encoder_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>encoder_configurations_list_only</code> resource, see <a href="/services/ivs/encoder_configurations/#permissions"><code>encoder_configurations</code></a>
-
diff --git a/website/docs/services/ivs/index.md b/website/docs/services/ivs/index.md
index 0afc21e8b..d076184f9 100644
--- a/website/docs/services/ivs/index.md
+++ b/website/docs/services/ivs/index.md
@@ -20,7 +20,7 @@ The ivs service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>20</b></span><br />
+<span>total resources:&nbsp;<b>10</b></span><br />
 </div>
 </div>
 
@@ -30,26 +30,16 @@ The ivs service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/ivs/channels/">channels</a><br />
-<a href="/services/ivs/channels_list_only/">channels_list_only</a><br />
 <a href="/services/ivs/encoder_configurations/">encoder_configurations</a><br />
-<a href="/services/ivs/encoder_configurations_list_only/">encoder_configurations_list_only</a><br />
 <a href="/services/ivs/ingest_configurations/">ingest_configurations</a><br />
-<a href="/services/ivs/ingest_configurations_list_only/">ingest_configurations_list_only</a><br />
 <a href="/services/ivs/playback_key_pairs/">playback_key_pairs</a><br />
-<a href="/services/ivs/playback_key_pairs_list_only/">playback_key_pairs_list_only</a><br />
-<a href="/services/ivs/playback_restriction_policies/">playback_restriction_policies</a><br />
-<a href="/services/ivs/playback_restriction_policies_list_only/">playback_restriction_policies_list_only</a>
+<a href="/services/ivs/playback_restriction_policies/">playback_restriction_policies</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/ivs/public_keys/">public_keys</a><br />
-<a href="/services/ivs/public_keys_list_only/">public_keys_list_only</a><br />
 <a href="/services/ivs/recording_configurations/">recording_configurations</a><br />
-<a href="/services/ivs/recording_configurations_list_only/">recording_configurations_list_only</a><br />
 <a href="/services/ivs/stages/">stages</a><br />
-<a href="/services/ivs/stages_list_only/">stages_list_only</a><br />
 <a href="/services/ivs/storage_configurations/">storage_configurations</a><br />
-<a href="/services/ivs/storage_configurations_list_only/">storage_configurations_list_only</a><br />
-<a href="/services/ivs/stream_keys/">stream_keys</a><br />
-<a href="/services/ivs/stream_keys_list_only/">stream_keys_list_only</a>
+<a href="/services/ivs/stream_keys/">stream_keys</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/ivs/ingest_configurations/index.md b/website/docs/services/ivs/ingest_configurations/index.md
index cf5d76b86..ee805add9 100644
--- a/website/docs/services/ivs/ingest_configurations/index.md
+++ b/website/docs/services/ivs/ingest_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ingest_configuration</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets an <code>ingest_configuration</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "IngestConfiguration ARN is automatically generated on creation and assigned as the unique identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-ingestconfiguration.html"><code>AWS::IVS::IngestConfiguration</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ingest_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ingest_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ingest_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ingest_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ingest_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ingest_configuration</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ tags
 FROM awscc.ivs.ingest_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ingest_configurations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ivs.ingest_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -243,6 +297,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ivs.ingest_configurations
+SET data__PatchDocument = string('{{ {
+    "StageArn": stage_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ivs/ingest_configurations_list_only/index.md b/website/docs/services/ivs/ingest_configurations_list_only/index.md
deleted file mode 100644
index 35c3cc8b6..000000000
--- a/website/docs/services/ivs/ingest_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: ingest_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ingest_configurations_list_only
-  - ivs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ingest_configurations</code> in a region or regions, for all properties use <a href="/services/ivs/ingest_configurations/"><code>ingest_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ingest_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IVS::IngestConfiguration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ivs.ingest_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "IngestConfiguration ARN is automatically generated on creation and assigned as the unique identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ingest_configurations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ivs.ingest_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ingest_configurations_list_only</code> resource, see <a href="/services/ivs/ingest_configurations/#permissions"><code>ingest_configurations</code></a>
-
diff --git a/website/docs/services/ivs/playback_key_pairs/index.md b/website/docs/services/ivs/playback_key_pairs/index.md
index 70c207c2e..ee5615337 100644
--- a/website/docs/services/ivs/playback_key_pairs/index.md
+++ b/website/docs/services/ivs/playback_key_pairs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>playback_key_pair</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>playback_key_pair</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Key-pair identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-playbackkeypair.html"><code>AWS::IVS::PlaybackKeyPair</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>playback_key_pairs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>playback_key_pairs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>playback_key_pairs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>playback_key_pairs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>playback_key_pairs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>playback_key_pair</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.ivs.playback_key_pairs
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>playback_key_pairs</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ivs.playback_key_pairs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +259,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ivs.playback_key_pairs
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ivs/playback_key_pairs_list_only/index.md b/website/docs/services/ivs/playback_key_pairs_list_only/index.md
deleted file mode 100644
index 0ebfe2e42..000000000
--- a/website/docs/services/ivs/playback_key_pairs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: playback_key_pairs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - playback_key_pairs_list_only
-  - ivs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>playback_key_pairs</code> in a region or regions, for all properties use <a href="/services/ivs/playback_key_pairs/"><code>playback_key_pairs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>playback_key_pairs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IVS::PlaybackKeyPair</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ivs.playback_key_pairs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Key-pair identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>playback_key_pairs</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ivs.playback_key_pairs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>playback_key_pairs_list_only</code> resource, see <a href="/services/ivs/playback_key_pairs/#permissions"><code>playback_key_pairs</code></a>
-
diff --git a/website/docs/services/ivs/playback_restriction_policies/index.md b/website/docs/services/ivs/playback_restriction_policies/index.md
index 7d2ce81ec..eafd488ce 100644
--- a/website/docs/services/ivs/playback_restriction_policies/index.md
+++ b/website/docs/services/ivs/playback_restriction_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>playback_restriction_policy</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>playback_restriction_policy</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Playback-restriction-policy identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-playbackrestrictionpolicy.html"><code>AWS::IVS::PlaybackRestrictionPolicy</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>playback_restriction_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>playback_restriction_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>playback_restriction_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>playback_restriction_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>playback_restriction_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>playback_restriction_policy</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.ivs.playback_restriction_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>playback_restriction_policies</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ivs.playback_restriction_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -225,6 +279,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ivs.playback_restriction_policies
+SET data__PatchDocument = string('{{ {
+    "AllowedCountries": allowed_countries,
+    "AllowedOrigins": allowed_origins,
+    "EnableStrictOriginEnforcement": enable_strict_origin_enforcement,
+    "Name": name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ivs/playback_restriction_policies_list_only/index.md b/website/docs/services/ivs/playback_restriction_policies_list_only/index.md
deleted file mode 100644
index 556093559..000000000
--- a/website/docs/services/ivs/playback_restriction_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: playback_restriction_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - playback_restriction_policies_list_only
-  - ivs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>playback_restriction_policies</code> in a region or regions, for all properties use <a href="/services/ivs/playback_restriction_policies/"><code>playback_restriction_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>playback_restriction_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IVS::PlaybackRestrictionPolicy.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ivs.playback_restriction_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Playback-restriction-policy identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>playback_restriction_policies</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ivs.playback_restriction_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>playback_restriction_policies_list_only</code> resource, see <a href="/services/ivs/playback_restriction_policies/#permissions"><code>playback_restriction_policies</code></a>
-
diff --git a/website/docs/services/ivs/public_keys/index.md b/website/docs/services/ivs/public_keys/index.md
index 4e692dd7e..535145f9d 100644
--- a/website/docs/services/ivs/public_keys/index.md
+++ b/website/docs/services/ivs/public_keys/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>public_key</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>public_key</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Key-pair identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-publickey.html"><code>AWS::IVS::PublicKey</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>public_keys</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>public_keys</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>public_keys</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>public_keys_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>public_keys</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>public_key</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.ivs.public_keys
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>public_keys</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ivs.public_keys_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +259,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ivs.public_keys
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ivs/public_keys_list_only/index.md b/website/docs/services/ivs/public_keys_list_only/index.md
deleted file mode 100644
index 18ca11a5a..000000000
--- a/website/docs/services/ivs/public_keys_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: public_keys_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - public_keys_list_only
-  - ivs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>public_keys</code> in a region or regions, for all properties use <a href="/services/ivs/public_keys/"><code>public_keys</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>public_keys_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IVS::PublicKey</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ivs.public_keys_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Key-pair identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>public_keys</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ivs.public_keys_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>public_keys_list_only</code> resource, see <a href="/services/ivs/public_keys/#permissions"><code>public_keys</code></a>
-
diff --git a/website/docs/services/ivs/recording_configurations/index.md b/website/docs/services/ivs/recording_configurations/index.md
index 38ffc5504..895ddd2ef 100644
--- a/website/docs/services/ivs/recording_configurations/index.md
+++ b/website/docs/services/ivs/recording_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>recording_configuration</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -142,6 +151,23 @@ Creates, updates, deletes or gets a <code>recording_configuration</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Recording Configuration ARN is automatically generated on creation and assigned as the unique identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-recordingconfiguration.html"><code>AWS::IVS::RecordingConfiguration</code></a>.
 
@@ -151,31 +177,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>recording_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DestinationConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>recording_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>recording_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>recording_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>recording_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -184,6 +216,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>recording_configuration</code>.
 ```sql
 SELECT
@@ -199,6 +240,19 @@ rendition_configuration
 FROM awscc.ivs.recording_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>recording_configurations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ivs.recording_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -291,6 +345,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ivs.recording_configurations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ivs/recording_configurations_list_only/index.md b/website/docs/services/ivs/recording_configurations_list_only/index.md
deleted file mode 100644
index e79f853bd..000000000
--- a/website/docs/services/ivs/recording_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: recording_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - recording_configurations_list_only
-  - ivs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>recording_configurations</code> in a region or regions, for all properties use <a href="/services/ivs/recording_configurations/"><code>recording_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>recording_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IVS::RecordingConfiguration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ivs.recording_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Recording Configuration ARN is automatically generated on creation and assigned as the unique identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>recording_configurations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ivs.recording_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>recording_configurations_list_only</code> resource, see <a href="/services/ivs/recording_configurations/#permissions"><code>recording_configurations</code></a>
-
diff --git a/website/docs/services/ivs/stages/index.md b/website/docs/services/ivs/stages/index.md
index 28e14bca6..c28c64ac8 100644
--- a/website/docs/services/ivs/stages/index.md
+++ b/website/docs/services/ivs/stages/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>stage</code> resource or lists <code>s
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -142,6 +151,23 @@ Creates, updates, deletes or gets a <code>stage</code> resource or lists <code>s
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Stage ARN is automatically generated on creation and assigned as the unique identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-stage.html"><code>AWS::IVS::Stage</code></a>.
 
@@ -151,31 +177,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>stages</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>stages</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>stages</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>stages_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>stages</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -184,6 +216,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>stage</code>.
 ```sql
 SELECT
@@ -196,6 +237,19 @@ active_session_id
 FROM awscc.ivs.stages
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>stages</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ivs.stages_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -283,6 +337,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ivs.stages
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "AutoParticipantRecordingConfiguration": auto_participant_recording_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ivs/stages_list_only/index.md b/website/docs/services/ivs/stages_list_only/index.md
deleted file mode 100644
index f74f23e46..000000000
--- a/website/docs/services/ivs/stages_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: stages_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - stages_list_only
-  - ivs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>stages</code> in a region or regions, for all properties use <a href="/services/ivs/stages/"><code>stages</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>stages_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IVS::Stage.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ivs.stages_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Stage ARN is automatically generated on creation and assigned as the unique identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>stages</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ivs.stages_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>stages_list_only</code> resource, see <a href="/services/ivs/stages/#permissions"><code>stages</code></a>
-
diff --git a/website/docs/services/ivs/storage_configurations/index.md b/website/docs/services/ivs/storage_configurations/index.md
index a72cbc11a..8a6eb6f30 100644
--- a/website/docs/services/ivs/storage_configurations/index.md
+++ b/website/docs/services/ivs/storage_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>storage_configuration</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -79,6 +88,23 @@ Creates, updates, deletes or gets a <code>storage_configuration</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Storage Configuration ARN is automatically generated on creation and assigned as the unique identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-storageconfiguration.html"><code>AWS::IVS::StorageConfiguration</code></a>.
 
@@ -88,31 +114,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>storage_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="S3, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>storage_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>storage_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>storage_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>storage_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -121,6 +153,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>storage_configuration</code>.
 ```sql
 SELECT
@@ -132,6 +173,19 @@ tags
 FROM awscc.ivs.storage_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>storage_configurations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ivs.storage_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -203,6 +257,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ivs.storage_configurations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ivs/storage_configurations_list_only/index.md b/website/docs/services/ivs/storage_configurations_list_only/index.md
deleted file mode 100644
index cb0854060..000000000
--- a/website/docs/services/ivs/storage_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: storage_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - storage_configurations_list_only
-  - ivs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>storage_configurations</code> in a region or regions, for all properties use <a href="/services/ivs/storage_configurations/"><code>storage_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>storage_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IVS::StorageConfiguration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ivs.storage_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Storage Configuration ARN is automatically generated on creation and assigned as the unique identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>storage_configurations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ivs.storage_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>storage_configurations_list_only</code> resource, see <a href="/services/ivs/storage_configurations/#permissions"><code>storage_configurations</code></a>
-
diff --git a/website/docs/services/ivs/stream_keys/index.md b/website/docs/services/ivs/stream_keys/index.md
index 013185200..3bf5b6d3c 100644
--- a/website/docs/services/ivs/stream_keys/index.md
+++ b/website/docs/services/ivs/stream_keys/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>stream_key</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>stream_key</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Stream Key ARN is automatically generated on creation and assigned as the unique identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-streamkey.html"><code>AWS::IVS::StreamKey</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>stream_keys</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ChannelArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>stream_keys</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>stream_keys</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>stream_keys_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>stream_keys</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>stream_key</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ value
 FROM awscc.ivs.stream_keys
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>stream_keys</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ivs.stream_keys_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -191,6 +245,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ivs.stream_keys
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ivs/stream_keys_list_only/index.md b/website/docs/services/ivs/stream_keys_list_only/index.md
deleted file mode 100644
index 43f3b805a..000000000
--- a/website/docs/services/ivs/stream_keys_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: stream_keys_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - stream_keys_list_only
-  - ivs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>stream_keys</code> in a region or regions, for all properties use <a href="/services/ivs/stream_keys/"><code>stream_keys</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>stream_keys_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IVS::StreamKey</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ivs.stream_keys_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Stream Key ARN is automatically generated on creation and assigned as the unique identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>stream_keys</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ivs.stream_keys_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>stream_keys_list_only</code> resource, see <a href="/services/ivs/stream_keys/#permissions"><code>stream_keys</code></a>
-
diff --git a/website/docs/services/ivschat/index.md b/website/docs/services/ivschat/index.md
index d65994674..b54939b0f 100644
--- a/website/docs/services/ivschat/index.md
+++ b/website/docs/services/ivschat/index.md
@@ -20,7 +20,7 @@ The ivschat service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The ivschat service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/ivschat/logging_configurations/">logging_configurations</a><br />
-<a href="/services/ivschat/logging_configurations_list_only/">logging_configurations_list_only</a>
+<a href="/services/ivschat/logging_configurations/">logging_configurations</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/ivschat/rooms/">rooms</a><br />
-<a href="/services/ivschat/rooms_list_only/">rooms_list_only</a>
+<a href="/services/ivschat/rooms/">rooms</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/ivschat/logging_configurations/index.md b/website/docs/services/ivschat/logging_configurations/index.md
index 64871d336..a35416679 100644
--- a/website/docs/services/ivschat/logging_configurations/index.md
+++ b/website/docs/services/ivschat/logging_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>logging_configuration</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -120,6 +129,23 @@ Creates, updates, deletes or gets a <code>logging_configuration</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "LoggingConfiguration ARN is automatically generated on creation and assigned as the unique identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivschat-loggingconfiguration.html"><code>AWS::IVSChat::LoggingConfiguration</code></a>.
 
@@ -129,31 +155,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>logging_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DestinationConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>logging_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>logging_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>logging_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>logging_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -162,6 +194,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>logging_configuration</code>.
 ```sql
 SELECT
@@ -175,6 +216,19 @@ tags
 FROM awscc.ivschat.logging_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>logging_configurations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ivschat.logging_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -251,6 +305,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ivschat.logging_configurations
+SET data__PatchDocument = string('{{ {
+    "DestinationConfiguration": destination_configuration,
+    "Name": name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ivschat/logging_configurations_list_only/index.md b/website/docs/services/ivschat/logging_configurations_list_only/index.md
deleted file mode 100644
index c1faa58cd..000000000
--- a/website/docs/services/ivschat/logging_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: logging_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - logging_configurations_list_only
-  - ivschat
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>logging_configurations</code> in a region or regions, for all properties use <a href="/services/ivschat/logging_configurations/"><code>logging_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>logging_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::IVSChat::LoggingConfiguration.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ivschat.logging_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "LoggingConfiguration ARN is automatically generated on creation and assigned as the unique identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>logging_configurations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ivschat.logging_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>logging_configurations_list_only</code> resource, see <a href="/services/ivschat/logging_configurations/#permissions"><code>logging_configurations</code></a>
-
diff --git a/website/docs/services/ivschat/rooms/index.md b/website/docs/services/ivschat/rooms/index.md
index 42b740137..1d8221597 100644
--- a/website/docs/services/ivschat/rooms/index.md
+++ b/website/docs/services/ivschat/rooms/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>room</code> resource or lists <code>ro
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -104,6 +113,23 @@ Creates, updates, deletes or gets a <code>room</code> resource or lists <code>ro
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Room ARN is automatically generated on creation and assigned as the unique identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivschat-room.html"><code>AWS::IVSChat::Room</code></a>.
 
@@ -113,31 +139,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>rooms</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>rooms</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>rooms</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>rooms_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>rooms</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -146,6 +178,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>room</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ tags
 FROM awscc.ivschat.rooms
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>rooms</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ivschat.rooms_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -246,6 +300,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ivschat.rooms
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "LoggingConfigurationIdentifiers": logging_configuration_identifiers,
+    "MaximumMessageLength": maximum_message_length,
+    "MaximumMessageRatePerSecond": maximum_message_rate_per_second,
+    "MessageReviewHandler": message_review_handler,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ivschat/rooms_list_only/index.md b/website/docs/services/ivschat/rooms_list_only/index.md
deleted file mode 100644
index 243cc98e6..000000000
--- a/website/docs/services/ivschat/rooms_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: rooms_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - rooms_list_only
-  - ivschat
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>rooms</code> in a region or regions, for all properties use <a href="/services/ivschat/rooms/"><code>rooms</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>rooms_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::IVSChat::Room.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ivschat.rooms_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Room ARN is automatically generated on creation and assigned as the unique identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>rooms</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ivschat.rooms_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>rooms_list_only</code> resource, see <a href="/services/ivschat/rooms/#permissions"><code>rooms</code></a>
-
diff --git a/website/docs/services/kafkaconnect/connectors/index.md b/website/docs/services/kafkaconnect/connectors/index.md
index e90e0c1c7..0baf94395 100644
--- a/website/docs/services/kafkaconnect/connectors/index.md
+++ b/website/docs/services/kafkaconnect/connectors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>connector</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "capacity",
@@ -409,6 +418,23 @@ Creates, updates, deletes or gets a <code>connector</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "connector_arn",
+    "type": "string",
+    "description": "Amazon Resource Name for the created Connector."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-connector.html"><code>AWS::KafkaConnect::Connector</code></a>.
 
@@ -418,31 +444,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Capacity, ConnectorConfiguration, ConnectorName, KafkaConnectVersion, KafkaCluster, KafkaClusterClientAuthentication, KafkaClusterEncryptionInTransit, Plugins, ServiceExecutionRoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>connectors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -451,6 +483,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>connector</code>.
 ```sql
 SELECT
@@ -472,6 +513,19 @@ worker_configuration
 FROM awscc.kafkaconnect.connectors
 WHERE region = 'us-east-1' AND data__Identifier = '<ConnectorArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>connectors</code> in a region.
+```sql
+SELECT
+region,
+connector_arn
+FROM awscc.kafkaconnect.connectors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -645,6 +699,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kafkaconnect.connectors
+SET data__PatchDocument = string('{{ {
+    "Capacity": capacity,
+    "ConnectorConfiguration": connector_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConnectorArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kafkaconnect/connectors_list_only/index.md b/website/docs/services/kafkaconnect/connectors_list_only/index.md
deleted file mode 100644
index 7ad0e1d88..000000000
--- a/website/docs/services/kafkaconnect/connectors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: connectors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - connectors_list_only
-  - kafkaconnect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>connectors</code> in a region or regions, for all properties use <a href="/services/kafkaconnect/connectors/"><code>connectors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>connectors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::KafkaConnect::Connector</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kafkaconnect.connectors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "connector_arn",
-    "type": "string",
-    "description": "Amazon Resource Name for the created Connector."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>connectors</code> in a region.
-```sql
-SELECT
-region,
-connector_arn
-FROM awscc.kafkaconnect.connectors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>connectors_list_only</code> resource, see <a href="/services/kafkaconnect/connectors/#permissions"><code>connectors</code></a>
-
diff --git a/website/docs/services/kafkaconnect/custom_plugins/index.md b/website/docs/services/kafkaconnect/custom_plugins/index.md
index f53606cf7..c41ff4109 100644
--- a/website/docs/services/kafkaconnect/custom_plugins/index.md
+++ b/website/docs/services/kafkaconnect/custom_plugins/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>custom_plugin</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -128,6 +137,23 @@ Creates, updates, deletes or gets a <code>custom_plugin</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "custom_plugin_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the custom plugin to use."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-customplugin.html"><code>AWS::KafkaConnect::CustomPlugin</code></a>.
 
@@ -137,31 +163,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>custom_plugins</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, ContentType, Location, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>custom_plugins</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>custom_plugins</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>custom_plugins_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>custom_plugins</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -170,6 +202,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>custom_plugin</code>.
 ```sql
 SELECT
@@ -185,6 +226,19 @@ tags
 FROM awscc.kafkaconnect.custom_plugins
 WHERE region = 'us-east-1' AND data__Identifier = '<CustomPluginArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>custom_plugins</code> in a region.
+```sql
+SELECT
+region,
+custom_plugin_arn
+FROM awscc.kafkaconnect.custom_plugins_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -271,6 +325,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kafkaconnect.custom_plugins
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CustomPluginArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kafkaconnect/custom_plugins_list_only/index.md b/website/docs/services/kafkaconnect/custom_plugins_list_only/index.md
deleted file mode 100644
index 2289337bc..000000000
--- a/website/docs/services/kafkaconnect/custom_plugins_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: custom_plugins_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - custom_plugins_list_only
-  - kafkaconnect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>custom_plugins</code> in a region or regions, for all properties use <a href="/services/kafkaconnect/custom_plugins/"><code>custom_plugins</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>custom_plugins_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An example resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kafkaconnect.custom_plugins_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "custom_plugin_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the custom plugin to use."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>custom_plugins</code> in a region.
-```sql
-SELECT
-region,
-custom_plugin_arn
-FROM awscc.kafkaconnect.custom_plugins_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>custom_plugins_list_only</code> resource, see <a href="/services/kafkaconnect/custom_plugins/#permissions"><code>custom_plugins</code></a>
-
diff --git a/website/docs/services/kafkaconnect/index.md b/website/docs/services/kafkaconnect/index.md
index dcce357c1..67ba2e381 100644
--- a/website/docs/services/kafkaconnect/index.md
+++ b/website/docs/services/kafkaconnect/index.md
@@ -20,7 +20,7 @@ The kafkaconnect service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The kafkaconnect service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/kafkaconnect/connectors/">connectors</a><br />
-<a href="/services/kafkaconnect/connectors_list_only/">connectors_list_only</a><br />
 <a href="/services/kafkaconnect/custom_plugins/">custom_plugins</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/kafkaconnect/custom_plugins_list_only/">custom_plugins_list_only</a><br />
-<a href="/services/kafkaconnect/worker_configurations/">worker_configurations</a><br />
-<a href="/services/kafkaconnect/worker_configurations_list_only/">worker_configurations_list_only</a>
+<a href="/services/kafkaconnect/worker_configurations/">worker_configurations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/kafkaconnect/worker_configurations/index.md b/website/docs/services/kafkaconnect/worker_configurations/index.md
index ee24fb3dd..2b0853974 100644
--- a/website/docs/services/kafkaconnect/worker_configurations/index.md
+++ b/website/docs/services/kafkaconnect/worker_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>worker_configuration</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>worker_configuration</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "worker_configuration_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the custom configuration."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-workerconfiguration.html"><code>AWS::KafkaConnect::WorkerConfiguration</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>worker_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, PropertiesFileContent, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>worker_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>worker_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>worker_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>worker_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>worker_configuration</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.kafkaconnect.worker_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<WorkerConfigurationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>worker_configurations</code> in a region.
+```sql
+SELECT
+region,
+worker_configuration_arn
+FROM awscc.kafkaconnect.worker_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -213,6 +267,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kafkaconnect.worker_configurations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<WorkerConfigurationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kafkaconnect/worker_configurations_list_only/index.md b/website/docs/services/kafkaconnect/worker_configurations_list_only/index.md
deleted file mode 100644
index 0f4462ba6..000000000
--- a/website/docs/services/kafkaconnect/worker_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: worker_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - worker_configurations_list_only
-  - kafkaconnect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>worker_configurations</code> in a region or regions, for all properties use <a href="/services/kafkaconnect/worker_configurations/"><code>worker_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>worker_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The configuration of the workers, which are the processes that run the connector logic.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kafkaconnect.worker_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "worker_configuration_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the custom configuration."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>worker_configurations</code> in a region.
-```sql
-SELECT
-region,
-worker_configuration_arn
-FROM awscc.kafkaconnect.worker_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>worker_configurations_list_only</code> resource, see <a href="/services/kafkaconnect/worker_configurations/#permissions"><code>worker_configurations</code></a>
-
diff --git a/website/docs/services/kendra/data_sources/index.md b/website/docs/services/kendra/data_sources/index.md
index 6f940b3e8..3c4baefa6 100644
--- a/website/docs/services/kendra/data_sources/index.md
+++ b/website/docs/services/kendra/data_sources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -1034,6 +1043,28 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Unique ID of index"
+  },
+  {
+    "name": "index_id",
+    "type": "string",
+    "description": "Unique ID of Index"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-datasource.html"><code>AWS::Kendra::DataSource</code></a>.
 
@@ -1043,31 +1074,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, IndexId, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_sources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -1076,6 +1113,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_source</code>.
 ```sql
 SELECT
@@ -1095,6 +1141,20 @@ language_code
 FROM awscc.kendra.data_sources
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>|<IndexId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_sources</code> in a region.
+```sql
+SELECT
+region,
+id,
+index_id
+FROM awscc.kendra.data_sources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1411,6 +1471,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kendra.data_sources
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "DataSourceConfiguration": data_source_configuration,
+    "Description": description,
+    "Schedule": schedule,
+    "RoleArn": role_arn,
+    "Tags": tags,
+    "CustomDocumentEnrichmentConfiguration": custom_document_enrichment_configuration,
+    "LanguageCode": language_code
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>|<IndexId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kendra/data_sources_list_only/index.md b/website/docs/services/kendra/data_sources_list_only/index.md
deleted file mode 100644
index bd2643966..000000000
--- a/website/docs/services/kendra/data_sources_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: data_sources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_sources_list_only
-  - kendra
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_sources</code> in a region or regions, for all properties use <a href="/services/kendra/data_sources/"><code>data_sources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_sources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Kendra DataSource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kendra.data_sources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Unique ID of index"
-  },
-  {
-    "name": "index_id",
-    "type": "string",
-    "description": "Unique ID of Index"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_sources</code> in a region.
-```sql
-SELECT
-region,
-id,
-index_id
-FROM awscc.kendra.data_sources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_sources_list_only</code> resource, see <a href="/services/kendra/data_sources/#permissions"><code>data_sources</code></a>
-
diff --git a/website/docs/services/kendra/faqs/index.md b/website/docs/services/kendra/faqs/index.md
index c62acbeda..3d904671f 100644
--- a/website/docs/services/kendra/faqs/index.md
+++ b/website/docs/services/kendra/faqs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>faq</code> resource or lists <code>faq
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -114,6 +123,28 @@ Creates, updates, deletes or gets a <code>faq</code> resource or lists <code>faq
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Unique ID of index"
+  },
+  {
+    "name": "index_id",
+    "type": "string",
+    "description": "Index ID"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-faq.html"><code>AWS::Kendra::Faq</code></a>.
 
@@ -123,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>faqs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IndexId, Name, S3Path, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>faqs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>faqs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>faqs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>faqs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>faq</code>.
 ```sql
 SELECT
@@ -173,6 +219,20 @@ language_code
 FROM awscc.kendra.faqs
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>|<IndexId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>faqs</code> in a region.
+```sql
+SELECT
+region,
+id,
+index_id
+FROM awscc.kendra.faqs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -271,6 +331,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kendra.faqs
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "LanguageCode": language_code
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>|<IndexId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kendra/faqs_list_only/index.md b/website/docs/services/kendra/faqs_list_only/index.md
deleted file mode 100644
index 2d9974b86..000000000
--- a/website/docs/services/kendra/faqs_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: faqs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - faqs_list_only
-  - kendra
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>faqs</code> in a region or regions, for all properties use <a href="/services/kendra/faqs/"><code>faqs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>faqs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A Kendra FAQ resource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kendra.faqs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Unique ID of index"
-  },
-  {
-    "name": "index_id",
-    "type": "string",
-    "description": "Index ID"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>faqs</code> in a region.
-```sql
-SELECT
-region,
-id,
-index_id
-FROM awscc.kendra.faqs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>faqs_list_only</code> resource, see <a href="/services/kendra/faqs/#permissions"><code>faqs</code></a>
-
diff --git a/website/docs/services/kendra/index.md b/website/docs/services/kendra/index.md
index 69c0e010f..9fd46e4e3 100644
--- a/website/docs/services/kendra/index.md
+++ b/website/docs/services/kendra/index.md
@@ -20,7 +20,7 @@ The kendra service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The kendra service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/kendra/data_sources/">data_sources</a><br />
-<a href="/services/kendra/data_sources_list_only/">data_sources_list_only</a><br />
 <a href="/services/kendra/faqs/">faqs</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/kendra/faqs_list_only/">faqs_list_only</a><br />
-<a href="/services/kendra/indices/">indices</a><br />
-<a href="/services/kendra/indices_list_only/">indices_list_only</a>
+<a href="/services/kendra/indices/">indices</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/kendra/indices/index.md b/website/docs/services/kendra/indices/index.md
index fddfcf212..462ecab45 100644
--- a/website/docs/services/kendra/indices/index.md
+++ b/website/docs/services/kendra/indices/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>index</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -265,6 +274,23 @@ Creates, updates, deletes or gets an <code>index</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Unique ID of index"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-index.html"><code>AWS::Kendra::Index</code></a>.
 
@@ -274,31 +300,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, RoleArn, Edition, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>indices_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -307,6 +339,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>index</code>.
 ```sql
 SELECT
@@ -326,6 +367,19 @@ user_token_configurations
 FROM awscc.kendra.indices
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>indices</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.kendra.indices_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -457,6 +511,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kendra.indices
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags,
+    "Name": name,
+    "RoleArn": role_arn,
+    "DocumentMetadataConfigurations": document_metadata_configurations,
+    "CapacityUnits": capacity_units,
+    "UserContextPolicy": user_context_policy,
+    "UserTokenConfigurations": user_token_configurations
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kendra/indices_list_only/index.md b/website/docs/services/kendra/indices_list_only/index.md
deleted file mode 100644
index 0ee9f05c5..000000000
--- a/website/docs/services/kendra/indices_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: indices_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - indices_list_only
-  - kendra
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>indices</code> in a region or regions, for all properties use <a href="/services/kendra/indices/"><code>indices</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>indices_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A Kendra index</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kendra.indices_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Unique ID of index"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>indices</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.kendra.indices_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>indices_list_only</code> resource, see <a href="/services/kendra/indices/#permissions"><code>indices</code></a>
-
diff --git a/website/docs/services/kendraranking/execution_plans/index.md b/website/docs/services/kendraranking/execution_plans/index.md
index 0ad86813c..39b340df0 100644
--- a/website/docs/services/kendraranking/execution_plans/index.md
+++ b/website/docs/services/kendraranking/execution_plans/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>execution_plan</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -89,6 +98,23 @@ Creates, updates, deletes or gets an <code>execution_plan</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Unique ID of rescore execution plan"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendraranking-executionplan.html"><code>AWS::KendraRanking::ExecutionPlan</code></a>.
 
@@ -98,31 +124,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>execution_plans</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>execution_plans</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>execution_plans</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>execution_plans_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>execution_plans</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -131,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>execution_plan</code>.
 ```sql
 SELECT
@@ -144,6 +185,19 @@ capacity_units
 FROM awscc.kendraranking.execution_plans
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>execution_plans</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.kendraranking.execution_plans_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kendraranking.execution_plans
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags,
+    "Name": name,
+    "CapacityUnits": capacity_units
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kendraranking/execution_plans_list_only/index.md b/website/docs/services/kendraranking/execution_plans_list_only/index.md
deleted file mode 100644
index 7fd203376..000000000
--- a/website/docs/services/kendraranking/execution_plans_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: execution_plans_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - execution_plans_list_only
-  - kendraranking
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>execution_plans</code> in a region or regions, for all properties use <a href="/services/kendraranking/execution_plans/"><code>execution_plans</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>execution_plans_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A KendraRanking Rescore execution plan</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kendraranking.execution_plans_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Unique ID of rescore execution plan"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>execution_plans</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.kendraranking.execution_plans_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>execution_plans_list_only</code> resource, see <a href="/services/kendraranking/execution_plans/#permissions"><code>execution_plans</code></a>
-
diff --git a/website/docs/services/kendraranking/index.md b/website/docs/services/kendraranking/index.md
index 1a75c8de3..467e16202 100644
--- a/website/docs/services/kendraranking/index.md
+++ b/website/docs/services/kendraranking/index.md
@@ -20,7 +20,7 @@ The kendraranking service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The kendraranking service documentation.
 <a href="/services/kendraranking/execution_plans/">execution_plans</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/kendraranking/execution_plans_list_only/">execution_plans_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/kinesis/index.md b/website/docs/services/kinesis/index.md
index 953cd8749..7ef4adaff 100644
--- a/website/docs/services/kinesis/index.md
+++ b/website/docs/services/kinesis/index.md
@@ -20,7 +20,7 @@ The kinesis service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>5</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,11 +30,9 @@ The kinesis service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/kinesis/resource_policies/">resource_policies</a><br />
-<a href="/services/kinesis/stream_consumers/">stream_consumers</a><br />
-<a href="/services/kinesis/stream_consumers_list_only/">stream_consumers_list_only</a>
+<a href="/services/kinesis/stream_consumers/">stream_consumers</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/kinesis/streams/">streams</a><br />
-<a href="/services/kinesis/streams_list_only/">streams_list_only</a>
+<a href="/services/kinesis/streams/">streams</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/kinesis/resource_policies/index.md b/website/docs/services/kinesis/resource_policies/index.md
index 706a8c5c5..97eddea23 100644
--- a/website/docs/services/kinesis/resource_policies/index.md
+++ b/website/docs/services/kinesis/resource_policies/index.md
@@ -162,6 +162,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kinesis.resource_policies
+SET data__PatchDocument = string('{{ {
+    "ResourcePolicy": resource_policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ResourceArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kinesis/stream_consumers/index.md b/website/docs/services/kinesis/stream_consumers/index.md
index ff56cd80e..5995fc280 100644
--- a/website/docs/services/kinesis/stream_consumers/index.md
+++ b/website/docs/services/kinesis/stream_consumers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>stream_consumer</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "consumer_creation_timestamp",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>stream_consumer</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "consumer_arn",
+    "type": "string",
+    "description": "The ARN returned by Kinesis Data Streams when you registered the consumer. If you don't know the ARN of the consumer that you want to deregister, you can use the ListStreamConsumers operation to get a list of the descriptions of all the consumers that are currently registered with a given data stream. The description of a consumer contains its ARN."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-streamconsumer.html"><code>AWS::Kinesis::StreamConsumer</code></a>.
 
@@ -91,26 +117,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>stream_consumers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConsumerName, StreamARN, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>stream_consumers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>stream_consumers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>stream_consumers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +150,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>stream_consumer</code>.
 ```sql
 SELECT
@@ -132,6 +172,19 @@ tags
 FROM awscc.kinesis.stream_consumers
 WHERE region = 'us-east-1' AND data__Identifier = '<ConsumerARN>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>stream_consumers</code> in a region.
+```sql
+SELECT
+region,
+consumer_arn
+FROM awscc.kinesis.stream_consumers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -204,6 +257,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kinesis/stream_consumers_list_only/index.md b/website/docs/services/kinesis/stream_consumers_list_only/index.md
deleted file mode 100644
index c0de6c56d..000000000
--- a/website/docs/services/kinesis/stream_consumers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: stream_consumers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - stream_consumers_list_only
-  - kinesis
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>stream_consumers</code> in a region or regions, for all properties use <a href="/services/kinesis/stream_consumers/"><code>stream_consumers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>stream_consumers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Kinesis::StreamConsumer</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kinesis.stream_consumers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "consumer_arn",
-    "type": "string",
-    "description": "The ARN returned by Kinesis Data Streams when you registered the consumer. If you don't know the ARN of the consumer that you want to deregister, you can use the ListStreamConsumers operation to get a list of the descriptions of all the consumers that are currently registered with a given data stream. The description of a consumer contains its ARN."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>stream_consumers</code> in a region.
-```sql
-SELECT
-region,
-consumer_arn
-FROM awscc.kinesis.stream_consumers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>stream_consumers_list_only</code> resource, see <a href="/services/kinesis/stream_consumers/#permissions"><code>stream_consumers</code></a>
-
diff --git a/website/docs/services/kinesis/streams/index.md b/website/docs/services/kinesis/streams/index.md
index 4266a5d22..9b9f6b791 100644
--- a/website/docs/services/kinesis/streams/index.md
+++ b/website/docs/services/kinesis/streams/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>stream</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -111,6 +120,23 @@ Creates, updates, deletes or gets a <code>stream</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the Kinesis stream."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-stream.html"><code>AWS::Kinesis::Stream</code></a>.
 
@@ -120,31 +146,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>streams</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>streams</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>streams</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>streams_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>streams</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -153,6 +185,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>stream</code>.
 ```sql
 SELECT
@@ -168,6 +209,19 @@ tags
 FROM awscc.kinesis.streams
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>streams</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.kinesis.streams_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -270,6 +324,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kinesis.streams
+SET data__PatchDocument = string('{{ {
+    "DesiredShardLevelMetrics": desired_shard_level_metrics,
+    "RetentionPeriodHours": retention_period_hours,
+    "ShardCount": shard_count,
+    "StreamModeDetails": stream_mode_details,
+    "StreamEncryption": stream_encryption,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kinesis/streams_list_only/index.md b/website/docs/services/kinesis/streams_list_only/index.md
deleted file mode 100644
index b8e5e61b1..000000000
--- a/website/docs/services/kinesis/streams_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: streams_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - streams_list_only
-  - kinesis
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>streams</code> in a region or regions, for all properties use <a href="/services/kinesis/streams/"><code>streams</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>streams_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Kinesis::Stream</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kinesis.streams_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the Kinesis stream."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>streams</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.kinesis.streams_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>streams_list_only</code> resource, see <a href="/services/kinesis/streams/#permissions"><code>streams</code></a>
-
diff --git a/website/docs/services/kinesisanalyticsv2/applications/index.md b/website/docs/services/kinesisanalyticsv2/applications/index.md
index a8fcc2641..107c56bfd 100644
--- a/website/docs/services/kinesisanalyticsv2/applications/index.md
+++ b/website/docs/services/kinesisanalyticsv2/applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "application_configuration",
@@ -445,6 +454,23 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_name",
+    "type": "string",
+    "description": "The name of the application."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-application.html"><code>AWS::KinesisAnalyticsV2::Application</code></a>.
 
@@ -454,31 +480,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RuntimeEnvironment, ServiceExecutionRole, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -487,6 +519,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application</code>.
 ```sql
 SELECT
@@ -503,6 +544,19 @@ tags
 FROM awscc.kinesisanalyticsv2.applications
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>applications</code> in a region.
+```sql
+SELECT
+region,
+application_name
+FROM awscc.kinesisanalyticsv2.applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -688,6 +742,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kinesisanalyticsv2.applications
+SET data__PatchDocument = string('{{ {
+    "ApplicationConfiguration": application_configuration,
+    "ApplicationDescription": application_description,
+    "RuntimeEnvironment": runtime_environment,
+    "ServiceExecutionRole": service_execution_role,
+    "RunConfiguration": run_configuration,
+    "ApplicationMaintenanceConfiguration": application_maintenance_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kinesisanalyticsv2/applications_list_only/index.md b/website/docs/services/kinesisanalyticsv2/applications_list_only/index.md
deleted file mode 100644
index 5ffff22e4..000000000
--- a/website/docs/services/kinesisanalyticsv2/applications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - applications_list_only
-  - kinesisanalyticsv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>applications</code> in a region or regions, for all properties use <a href="/services/kinesisanalyticsv2/applications/"><code>applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates an Amazon Kinesis Data Analytics application. For information about creating a Kinesis Data Analytics application, see &#91;Creating an Application&#93;(https://docs.aws.amazon.com/kinesisanalytics/latest/java/getting-started.html).</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kinesisanalyticsv2.applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_name",
-    "type": "string",
-    "description": "The name of the application."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>applications</code> in a region.
-```sql
-SELECT
-region,
-application_name
-FROM awscc.kinesisanalyticsv2.applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>applications_list_only</code> resource, see <a href="/services/kinesisanalyticsv2/applications/#permissions"><code>applications</code></a>
-
diff --git a/website/docs/services/kinesisanalyticsv2/index.md b/website/docs/services/kinesisanalyticsv2/index.md
index 2703d52bf..7540e538f 100644
--- a/website/docs/services/kinesisanalyticsv2/index.md
+++ b/website/docs/services/kinesisanalyticsv2/index.md
@@ -20,7 +20,7 @@ The kinesisanalyticsv2 service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The kinesisanalyticsv2 service documentation.
 <a href="/services/kinesisanalyticsv2/applications/">applications</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/kinesisanalyticsv2/applications_list_only/">applications_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/kinesisfirehose/delivery_streams/index.md b/website/docs/services/kinesisfirehose/delivery_streams/index.md
index f204d16f1..7b80dd85b 100644
--- a/website/docs/services/kinesisfirehose/delivery_streams/index.md
+++ b/website/docs/services/kinesisfirehose/delivery_streams/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>delivery_stream</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "delivery_stream_encryption_configuration_input",
@@ -2683,6 +2692,23 @@ Creates, updates, deletes or gets a <code>delivery_stream</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "delivery_stream_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html"><code>AWS::KinesisFirehose::DeliveryStream</code></a>.
 
@@ -2692,31 +2718,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>delivery_streams</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>delivery_streams</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>delivery_streams</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>delivery_streams_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>delivery_streams</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -2725,6 +2757,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>delivery_stream</code>.
 ```sql
 SELECT
@@ -2751,6 +2792,19 @@ tags
 FROM awscc.kinesisfirehose.delivery_streams
 WHERE region = 'us-east-1' AND data__Identifier = '<DeliveryStreamName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>delivery_streams</code> in a region.
+```sql
+SELECT
+region,
+delivery_stream_name
+FROM awscc.kinesisfirehose.delivery_streams_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -3185,6 +3239,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kinesisfirehose.delivery_streams
+SET data__PatchDocument = string('{{ {
+    "DeliveryStreamEncryptionConfigurationInput": delivery_stream_encryption_configuration_input,
+    "HttpEndpointDestinationConfiguration": http_endpoint_destination_configuration,
+    "RedshiftDestinationConfiguration": redshift_destination_configuration,
+    "SplunkDestinationConfiguration": splunk_destination_configuration,
+    "ExtendedS3DestinationConfiguration": extended_s3_destination_configuration,
+    "S3DestinationConfiguration": s3_destination_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DeliveryStreamName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kinesisfirehose/delivery_streams_list_only/index.md b/website/docs/services/kinesisfirehose/delivery_streams_list_only/index.md
deleted file mode 100644
index 9409cb026..000000000
--- a/website/docs/services/kinesisfirehose/delivery_streams_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: delivery_streams_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - delivery_streams_list_only
-  - kinesisfirehose
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>delivery_streams</code> in a region or regions, for all properties use <a href="/services/kinesisfirehose/delivery_streams/"><code>delivery_streams</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>delivery_streams_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::KinesisFirehose::DeliveryStream</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kinesisfirehose.delivery_streams_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "delivery_stream_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>delivery_streams</code> in a region.
-```sql
-SELECT
-region,
-delivery_stream_name
-FROM awscc.kinesisfirehose.delivery_streams_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>delivery_streams_list_only</code> resource, see <a href="/services/kinesisfirehose/delivery_streams/#permissions"><code>delivery_streams</code></a>
-
diff --git a/website/docs/services/kinesisfirehose/index.md b/website/docs/services/kinesisfirehose/index.md
index 89aa73cfc..6014d39b1 100644
--- a/website/docs/services/kinesisfirehose/index.md
+++ b/website/docs/services/kinesisfirehose/index.md
@@ -20,7 +20,7 @@ The kinesisfirehose service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The kinesisfirehose service documentation.
 <a href="/services/kinesisfirehose/delivery_streams/">delivery_streams</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/kinesisfirehose/delivery_streams_list_only/">delivery_streams_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/kinesisvideo/index.md b/website/docs/services/kinesisvideo/index.md
index cf3ec0127..b84523dc3 100644
--- a/website/docs/services/kinesisvideo/index.md
+++ b/website/docs/services/kinesisvideo/index.md
@@ -20,7 +20,7 @@ The kinesisvideo service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The kinesisvideo service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/kinesisvideo/signaling_channels/">signaling_channels</a><br />
-<a href="/services/kinesisvideo/signaling_channels_list_only/">signaling_channels_list_only</a>
+<a href="/services/kinesisvideo/signaling_channels/">signaling_channels</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/kinesisvideo/streams/">streams</a><br />
-<a href="/services/kinesisvideo/streams_list_only/">streams_list_only</a>
+<a href="/services/kinesisvideo/streams/">streams</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/kinesisvideo/signaling_channels/index.md b/website/docs/services/kinesisvideo/signaling_channels/index.md
index c15fe6e7b..7fe93b345 100644
--- a/website/docs/services/kinesisvideo/signaling_channels/index.md
+++ b/website/docs/services/kinesisvideo/signaling_channels/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>signaling_channel</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>signaling_channel</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the Kinesis Video Signaling Channel."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisvideo-signalingchannel.html"><code>AWS::KinesisVideo::SignalingChannel</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>signaling_channels</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>signaling_channels</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>signaling_channels</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>signaling_channels_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>signaling_channels</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>signaling_channel</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.kinesisvideo.signaling_channels
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>signaling_channels</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.kinesisvideo.signaling_channels_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +259,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kinesisvideo.signaling_channels
+SET data__PatchDocument = string('{{ {
+    "Type": type,
+    "MessageTtlSeconds": message_ttl_seconds,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kinesisvideo/signaling_channels_list_only/index.md b/website/docs/services/kinesisvideo/signaling_channels_list_only/index.md
deleted file mode 100644
index 0dc31b55f..000000000
--- a/website/docs/services/kinesisvideo/signaling_channels_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: signaling_channels_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - signaling_channels_list_only
-  - kinesisvideo
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>signaling_channels</code> in a region or regions, for all properties use <a href="/services/kinesisvideo/signaling_channels/"><code>signaling_channels</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>signaling_channels_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type Definition for AWS::KinesisVideo::SignalingChannel</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kinesisvideo.signaling_channels_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the Kinesis Video Signaling Channel."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>signaling_channels</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.kinesisvideo.signaling_channels_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>signaling_channels_list_only</code> resource, see <a href="/services/kinesisvideo/signaling_channels/#permissions"><code>signaling_channels</code></a>
-
diff --git a/website/docs/services/kinesisvideo/streams/index.md b/website/docs/services/kinesisvideo/streams/index.md
index f943c9b8c..a8e74f883 100644
--- a/website/docs/services/kinesisvideo/streams/index.md
+++ b/website/docs/services/kinesisvideo/streams/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>stream</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>stream</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the Kinesis Video stream."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisvideo-stream.html"><code>AWS::KinesisVideo::Stream</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>streams</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>streams</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>streams</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>streams_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>streams</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>stream</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.kinesisvideo.streams
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>streams</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.kinesisvideo.streams_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -225,6 +279,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kinesisvideo.streams
+SET data__PatchDocument = string('{{ {
+    "DataRetentionInHours": data_retention_in_hours,
+    "DeviceName": device_name,
+    "KmsKeyId": kms_key_id,
+    "MediaType": media_type,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kinesisvideo/streams_list_only/index.md b/website/docs/services/kinesisvideo/streams_list_only/index.md
deleted file mode 100644
index b95c805bd..000000000
--- a/website/docs/services/kinesisvideo/streams_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: streams_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - streams_list_only
-  - kinesisvideo
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>streams</code> in a region or regions, for all properties use <a href="/services/kinesisvideo/streams/"><code>streams</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>streams_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type Definition for AWS::KinesisVideo::Stream</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kinesisvideo.streams_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the Kinesis Video stream."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>streams</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.kinesisvideo.streams_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>streams_list_only</code> resource, see <a href="/services/kinesisvideo/streams/#permissions"><code>streams</code></a>
-
diff --git a/website/docs/services/kms/aliases/index.md b/website/docs/services/kms/aliases/index.md
index 591af2aa4..250952fd5 100644
--- a/website/docs/services/kms/aliases/index.md
+++ b/website/docs/services/kms/aliases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>alias</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "target_key_id",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets an <code>alias</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "alias_name",
+    "type": "string",
+    "description": "Specifies the alias name. This value must begin with &#96;&#96;alias/&#96;&#96; followed by a name, such as &#96;&#96;alias/ExampleAlias&#96;&#96;. <br />If you change the value of the &#96;&#96;AliasName&#96;&#96; property, the existing alias is deleted and a new alias is created for the specified KMS key. This change can disrupt applications that use the alias. It can also allow or deny access to a KMS key affected by attribute-based access control (ABAC).<br />The alias must be string of 1-256 characters. It can contain only alphanumeric characters, forward slashes (/), underscores (&#95;), and dashes (-). The alias name cannot begin with &#96;&#96;alias/aws/&#96;&#96;. The &#96;&#96;alias/aws/&#96;&#96; prefix is reserved for &#91;&#93;(https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-managed-cmk)."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-alias.html"><code>AWS::KMS::Alias</code></a>.
 
@@ -59,31 +85,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AliasName, TargetKeyId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>aliases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +124,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>alias</code>.
 ```sql
 SELECT
@@ -101,6 +142,19 @@ alias_name
 FROM awscc.kms.aliases
 WHERE region = 'us-east-1' AND data__Identifier = '<AliasName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>aliases</code> in a region.
+```sql
+SELECT
+region,
+alias_name
+FROM awscc.kms.aliases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -167,6 +221,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kms.aliases
+SET data__PatchDocument = string('{{ {
+    "TargetKeyId": target_key_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AliasName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kms/aliases_list_only/index.md b/website/docs/services/kms/aliases_list_only/index.md
deleted file mode 100644
index dafd6a52e..000000000
--- a/website/docs/services/kms/aliases_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: aliases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - aliases_list_only
-  - kms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>aliases</code> in a region or regions, for all properties use <a href="/services/kms/aliases/"><code>aliases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>aliases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::KMS::Alias&#96;&#96; resource specifies a display name for a &#91;KMS key&#93;(https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#kms&#95;keys). You can use an alias to identify a KMS key in the KMS console, in the &#91;DescribeKey&#93;(https://docs.aws.amazon.com/kms/latest/APIReference/API&#95;DescribeKey.html) operation, and in &#91;cryptographic operations&#93;(https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#cryptographic-operations), such as &#91;Decrypt&#93;(https://docs.aws.amazon.com/kms/latest/APIReference/API&#95;Decrypt.html) and &#91;GenerateDataKey&#93;(https://docs.aws.amazon.com/kms/latest/APIReference/API&#95;GenerateDataKey.html).<br />Adding, deleting, or updating an alias can allow or deny permission to the KMS key. For details, see &#91;ABAC for&#93;(https://docs.aws.amazon.com/kms/latest/developerguide/abac.html) in the &#42;Developer Guide&#42;.<br />Using an alias to refer to a KMS key can help you simplify key management. For example, an alias in your code can be associated with different KMS keys in different AWS-Regions. For more information, see &#91;Using aliases&#93;(https://docs.aws.amazon.com/kms/latest/developerguide/kms-alias.html) in the &#42;Developer Guide&#42;.<br />When specifying an alias, observe the following rules.<br />+ Each alias is associated with one KMS key, but multiple aliases can be associated with the same KMS key.<br />+ The alias and its associated KMS key must be in the same AWS-account and Region.<br />+ The alias name must be unique in the AWS-account and Region. However, you can create aliases with the same name in different AWS-Regions. For example, you can have an &#96;&#96;alias/projectKey&#96;&#96; in multiple Regions, each of which is associated with a KMS key in its Region.<br />+ Each alias name must begin with &#96;&#96;alias/&#96;&#96; followed by a name, such as &#96;&#96;alias/exampleKey&#96;&#96;. The alias name can contain only alphanumeric characters, forward slashes (/), underscores (&#95;), and dashes (-). Alias names cannot begin with &#96;&#96;alias/aws/&#96;&#96;. That alias name prefix is reserved for &#91;&#93;(https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-managed-cmk).<br /><br />&#42;Regions&#42; <br />KMS CloudFormation resources are available in all AWS-Regions in which KMS and CFN are supported.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kms.aliases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "alias_name",
-    "type": "string",
-    "description": "Specifies the alias name. This value must begin with &#96;&#96;alias/&#96;&#96; followed by a name, such as &#96;&#96;alias/ExampleAlias&#96;&#96;. <br />If you change the value of the &#96;&#96;AliasName&#96;&#96; property, the existing alias is deleted and a new alias is created for the specified KMS key. This change can disrupt applications that use the alias. It can also allow or deny access to a KMS key affected by attribute-based access control (ABAC).<br />The alias must be string of 1-256 characters. It can contain only alphanumeric characters, forward slashes (/), underscores (&#95;), and dashes (-). The alias name cannot begin with &#96;&#96;alias/aws/&#96;&#96;. The &#96;&#96;alias/aws/&#96;&#96; prefix is reserved for &#91;&#93;(https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-managed-cmk)."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>aliases</code> in a region.
-```sql
-SELECT
-region,
-alias_name
-FROM awscc.kms.aliases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>aliases_list_only</code> resource, see <a href="/services/kms/aliases/#permissions"><code>aliases</code></a>
-
diff --git a/website/docs/services/kms/index.md b/website/docs/services/kms/index.md
index 275c52fb7..0cc8aa932 100644
--- a/website/docs/services/kms/index.md
+++ b/website/docs/services/kms/index.md
@@ -20,7 +20,7 @@ The kms service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The kms service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/kms/aliases/">aliases</a><br />
-<a href="/services/kms/aliases_list_only/">aliases_list_only</a><br />
 <a href="/services/kms/keys/">keys</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/kms/keys_list_only/">keys_list_only</a><br />
-<a href="/services/kms/replica_keys/">replica_keys</a><br />
-<a href="/services/kms/replica_keys_list_only/">replica_keys_list_only</a>
+<a href="/services/kms/replica_keys/">replica_keys</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/kms/keys/index.md b/website/docs/services/kms/keys/index.md
index d3390fe96..1a9d30897 100644
--- a/website/docs/services/kms/keys/index.md
+++ b/website/docs/services/kms/keys/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>key</code> resource or lists <code>key
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -122,6 +131,23 @@ Creates, updates, deletes or gets a <code>key</code> resource or lists <code>key
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "key_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html"><code>AWS::KMS::Key</code></a>.
 
@@ -131,31 +157,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>keys</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>keys</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>keys</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>keys_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>keys</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -164,6 +196,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>key</code>.
 ```sql
 SELECT
@@ -185,6 +226,19 @@ rotation_period_in_days
 FROM awscc.kms.keys
 WHERE region = 'us-east-1' AND data__Identifier = '<KeyId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>keys</code> in a region.
+```sql
+SELECT
+region,
+key_id
+FROM awscc.kms.keys_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -313,6 +367,30 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kms.keys
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Enabled": enabled,
+    "EnableKeyRotation": enable_key_rotation,
+    "KeyPolicy": key_policy,
+    "KeyUsage": key_usage,
+    "Origin": origin,
+    "KeySpec": key_spec,
+    "MultiRegion": multi_region,
+    "PendingWindowInDays": pending_window_in_days,
+    "Tags": tags,
+    "BypassPolicyLockoutSafetyCheck": bypass_policy_lockout_safety_check,
+    "RotationPeriodInDays": rotation_period_in_days
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<KeyId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kms/keys_list_only/index.md b/website/docs/services/kms/keys_list_only/index.md
deleted file mode 100644
index fd10cbf10..000000000
--- a/website/docs/services/kms/keys_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: keys_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - keys_list_only
-  - kms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>keys</code> in a region or regions, for all properties use <a href="/services/kms/keys/"><code>keys</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>keys_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::KMS::Key&#96;&#96; resource specifies an &#91;KMS key&#93;(https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#kms&#95;keys) in KMSlong. You can use this resource to create symmetric encryption KMS keys, asymmetric KMS keys for encryption or signing, and symmetric HMAC KMS keys. You can use &#96;&#96;AWS::KMS::Key&#96;&#96; to create &#91;multi-Region primary keys&#93;(https://docs.aws.amazon.com/kms/latest/developerguide/multi-region-keys-overview.html#mrk-primary-key) of all supported types. To replicate a multi-Region key, use the &#96;&#96;AWS::KMS::ReplicaKey&#96;&#96; resource.<br />If you change the value of the &#96;&#96;KeySpec&#96;&#96;, &#96;&#96;KeyUsage&#96;&#96;, &#96;&#96;Origin&#96;&#96;, or &#96;&#96;MultiRegion&#96;&#96; properties of an existing KMS key, the update request fails, regardless of the value of the &#91;UpdateReplacePolicy attribute&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-updatereplacepolicy.html). This prevents you from accidentally deleting a KMS key by changing any of its immutable property values.<br />KMS replaced the term &#42;customer master key (CMK)&#42; with &#42;&#42; and &#42;KMS key&#42;. The concept has not changed. To prevent breaking changes, KMS is keeping some variations of this term.<br />You can use symmetric encryption KMS keys to encrypt and decrypt small amounts of data, but they are more commonly used to generate data keys and data key pairs. You can also use a symmetric encryption KMS key to encrypt data stored in AWS services that are &#91;integrated with&#93;(https://docs.aws.amazon.com//kms/features/#AWS&#95;Service&#95;Integration). For more information, see &#91;Symmetric encryption KMS keys&#93;(https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#symmetric-cmks) in the &#42;Developer Guide&#42;.<br />You can use asymmetric KMS keys to encrypt and decrypt data or sign messages and verify signatures. To create an asymmetric key, you must specify an asymmetric &#96;&#96;KeySpec&#96;&#96; value and a &#96;&#96;KeyUsage&#96;&#96; value. For details, see &#91;Asymmetric keys in&#93;(https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html) in the &#42;Developer Guide&#42;.<br />You can use HMAC KMS keys (which are also symmetric keys) to generate and verify hash-based message authentication codes. To create an HMAC key, you must specify an HMAC &#96;&#96;KeySpec&#96;&#96; value and a &#96;&#96;KeyUsage&#96;&#96; value of &#96;&#96;GENERATE&#95;VERIFY&#95;MAC&#96;&#96;. For details, see &#91;HMAC keys in&#93;(https://docs.aws.amazon.com/kms/latest/developerguide/hmac.html) in the &#42;Developer Guide&#42;.<br />You can also create symmetric encryption, asymmetric, and HMAC multi-Region primary keys. To create a multi-Region primary key, set the &#96;&#96;MultiRegion&#96;&#96; property to &#96;&#96;true&#96;&#96;. For information about multi-Region keys, see &#91;Multi-Region keys in&#93;(https://docs.aws.amazon.com/kms/latest/developerguide/multi-region-keys-overview.html) in the &#42;Developer Guide&#42;.<br />You cannot use the &#96;&#96;AWS::KMS::Key&#96;&#96; resource to specify a KMS key with &#91;imported key material&#93;(https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html) or a KMS key in a &#91;custom key store&#93;(https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html).<br />&#42;Regions&#42; <br />KMS CloudFormation resources are available in all Regions in which KMS and CFN are supported. You can use the &#96;&#96;AWS::KMS::Key&#96;&#96; resource to create and manage all KMS key types that are supported in a Region.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kms.keys_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "key_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>keys</code> in a region.
-```sql
-SELECT
-region,
-key_id
-FROM awscc.kms.keys_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>keys_list_only</code> resource, see <a href="/services/kms/keys/#permissions"><code>keys</code></a>
-
diff --git a/website/docs/services/kms/replica_keys/index.md b/website/docs/services/kms/replica_keys/index.md
index f15dbd463..5d23761f8 100644
--- a/website/docs/services/kms/replica_keys/index.md
+++ b/website/docs/services/kms/replica_keys/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>replica_key</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>replica_key</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "key_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-replicakey.html"><code>AWS::KMS::ReplicaKey</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>replica_keys</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PrimaryKeyArn, KeyPolicy, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>replica_keys</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>replica_keys</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>replica_keys_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>replica_keys</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>replica_key</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.kms.replica_keys
 WHERE region = 'us-east-1' AND data__Identifier = '<KeyId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>replica_keys</code> in a region.
+```sql
+SELECT
+region,
+key_id
+FROM awscc.kms.replica_keys_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -233,6 +287,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.kms.replica_keys
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "PendingWindowInDays": pending_window_in_days,
+    "KeyPolicy": key_policy,
+    "Enabled": enabled,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<KeyId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/kms/replica_keys_list_only/index.md b/website/docs/services/kms/replica_keys_list_only/index.md
deleted file mode 100644
index 37594ca82..000000000
--- a/website/docs/services/kms/replica_keys_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: replica_keys_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - replica_keys_list_only
-  - kms
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>replica_keys</code> in a region or regions, for all properties use <a href="/services/kms/replica_keys/"><code>replica_keys</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>replica_keys_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::KMS::ReplicaKey resource specifies a multi-region replica AWS KMS key in AWS Key Management Service (AWS KMS).</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.kms.replica_keys_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "key_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>replica_keys</code> in a region.
-```sql
-SELECT
-region,
-key_id
-FROM awscc.kms.replica_keys_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>replica_keys_list_only</code> resource, see <a href="/services/kms/replica_keys/#permissions"><code>replica_keys</code></a>
-
diff --git a/website/docs/services/lakeformation/data_cells_filters/index.md b/website/docs/services/lakeformation/data_cells_filters/index.md
index b6168dd14..515ecf91f 100644
--- a/website/docs/services/lakeformation/data_cells_filters/index.md
+++ b/website/docs/services/lakeformation/data_cells_filters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_cells_filter</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "table_catalog_id",
@@ -77,6 +86,28 @@ Creates, updates, deletes or gets a <code>data_cells_filter</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "table_catalog_id",
+    "type": "string",
+    "description": "The Catalog Id of the Table on which to create a Data Cells Filter."
+  },
+  {
+    "name": "database_name",
+    "type": "string",
+    "description": "The name of the Database that the Table resides in."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-datacellsfilter.html"><code>AWS::LakeFormation::DataCellsFilter</code></a>.
 
@@ -86,26 +117,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_cells_filters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TableCatalogId, DatabaseName, TableName, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_cells_filters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_cells_filters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_cells_filters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +150,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_cells_filter</code>.
 ```sql
 SELECT
@@ -128,6 +173,22 @@ column_wildcard
 FROM awscc.lakeformation.data_cells_filters
 WHERE region = 'us-east-1' AND data__Identifier = '<TableCatalogId>|<DatabaseName>|<TableName>|<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_cells_filters</code> in a region.
+```sql
+SELECT
+region,
+table_catalog_id,
+database_name,
+table_name,
+name
+FROM awscc.lakeformation.data_cells_filters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -222,6 +283,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lakeformation/data_cells_filters_list_only/index.md b/website/docs/services/lakeformation/data_cells_filters_list_only/index.md
deleted file mode 100644
index d43e519fe..000000000
--- a/website/docs/services/lakeformation/data_cells_filters_list_only/index.md
+++ /dev/null
@@ -1,88 +0,0 @@
----
-title: data_cells_filters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_cells_filters_list_only
-  - lakeformation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_cells_filters</code> in a region or regions, for all properties use <a href="/services/lakeformation/data_cells_filters/"><code>data_cells_filters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_cells_filters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A resource schema representing a Lake Formation Data Cells Filter.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lakeformation.data_cells_filters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "table_catalog_id",
-    "type": "string",
-    "description": "The Catalog Id of the Table on which to create a Data Cells Filter."
-  },
-  {
-    "name": "database_name",
-    "type": "string",
-    "description": "The name of the Database that the Table resides in."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_cells_filters</code> in a region.
-```sql
-SELECT
-region,
-table_catalog_id,
-database_name,
-table_name,
-name
-FROM awscc.lakeformation.data_cells_filters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_cells_filters_list_only</code> resource, see <a href="/services/lakeformation/data_cells_filters/#permissions"><code>data_cells_filters</code></a>
-
diff --git a/website/docs/services/lakeformation/index.md b/website/docs/services/lakeformation/index.md
index 740c89091..931deb253 100644
--- a/website/docs/services/lakeformation/index.md
+++ b/website/docs/services/lakeformation/index.md
@@ -20,7 +20,7 @@ The lakeformation service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,10 @@ The lakeformation service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/lakeformation/data_cells_filters/">data_cells_filters</a><br />
-<a href="/services/lakeformation/data_cells_filters_list_only/">data_cells_filters_list_only</a><br />
 <a href="/services/lakeformation/principal_permissions/">principal_permissions</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/lakeformation/tag_associations/">tag_associations</a><br />
-<a href="/services/lakeformation/tags/">tags</a><br />
-<a href="/services/lakeformation/tags_list_only/">tags_list_only</a>
+<a href="/services/lakeformation/tags/">tags</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/lakeformation/principal_permissions/index.md b/website/docs/services/lakeformation/principal_permissions/index.md
index 0d9ebdaec..ec4c9e1a6 100644
--- a/website/docs/services/lakeformation/principal_permissions/index.md
+++ b/website/docs/services/lakeformation/principal_permissions/index.md
@@ -275,6 +275,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lakeformation/tag_associations/index.md b/website/docs/services/lakeformation/tag_associations/index.md
index dd81699c2..5ede4b6f5 100644
--- a/website/docs/services/lakeformation/tag_associations/index.md
+++ b/website/docs/services/lakeformation/tag_associations/index.md
@@ -273,6 +273,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lakeformation/tags/index.md b/website/docs/services/lakeformation/tags/index.md
index ae916129f..7d27ef5a5 100644
--- a/website/docs/services/lakeformation/tags/index.md
+++ b/website/docs/services/lakeformation/tags/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>tag</code> resource or lists <code>tag
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "catalog_id",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets a <code>tag</code> resource or lists <code>tag
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "tag_key",
+    "type": "string",
+    "description": "The key-name for the LF-tag."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-tag.html"><code>AWS::LakeFormation::Tag</code></a>.
 
@@ -64,31 +90,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>tags</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TagKey, TagValues, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>tags</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>tags</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>tags_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>tags</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +129,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>tag</code>.
 ```sql
 SELECT
@@ -107,6 +148,19 @@ tag_values
 FROM awscc.lakeformation.tags
 WHERE region = 'us-east-1' AND data__Identifier = '<TagKey>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>tags</code> in a region.
+```sql
+SELECT
+region,
+tag_key
+FROM awscc.lakeformation.tags_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -178,6 +232,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lakeformation.tags
+SET data__PatchDocument = string('{{ {
+    "TagValues": tag_values
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TagKey>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lakeformation/tags_list_only/index.md b/website/docs/services/lakeformation/tags_list_only/index.md
deleted file mode 100644
index 1adc90364..000000000
--- a/website/docs/services/lakeformation/tags_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: tags_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - tags_list_only
-  - lakeformation
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>tags</code> in a region or regions, for all properties use <a href="/services/lakeformation/tags/"><code>tags</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>tags_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A resource schema representing a Lake Formation Tag.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lakeformation.tags_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "tag_key",
-    "type": "string",
-    "description": "The key-name for the LF-tag."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>tags</code> in a region.
-```sql
-SELECT
-region,
-tag_key
-FROM awscc.lakeformation.tags_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>tags_list_only</code> resource, see <a href="/services/lakeformation/tags/#permissions"><code>tags</code></a>
-
diff --git a/website/docs/services/lambda/aliases/index.md b/website/docs/services/lambda/aliases/index.md
index 9f2802080..ff79f7434 100644
--- a/website/docs/services/lambda/aliases/index.md
+++ b/website/docs/services/lambda/aliases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>alias</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "function_name",
@@ -101,6 +110,23 @@ Creates, updates, deletes or gets an <code>alias</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "alias_arn",
+    "type": "string",
+    "description": "Lambda Alias ARN generated by the service."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html"><code>AWS::Lambda::Alias</code></a>.
 
@@ -110,31 +136,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FunctionName, FunctionVersion, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>aliases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -143,6 +175,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>alias</code>.
 ```sql
 SELECT
@@ -157,6 +198,19 @@ name
 FROM awscc.lambda.aliases
 WHERE region = 'us-east-1' AND data__Identifier = '<AliasArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>aliases</code> in a region.
+```sql
+SELECT
+region,
+alias_arn
+FROM awscc.lambda.aliases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -245,6 +299,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lambda.aliases
+SET data__PatchDocument = string('{{ {
+    "ProvisionedConcurrencyConfig": provisioned_concurrency_config,
+    "Description": description,
+    "FunctionVersion": function_version,
+    "RoutingConfig": routing_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AliasArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lambda/aliases_list_only/index.md b/website/docs/services/lambda/aliases_list_only/index.md
deleted file mode 100644
index 613a83666..000000000
--- a/website/docs/services/lambda/aliases_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: aliases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - aliases_list_only
-  - lambda
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>aliases</code> in a region or regions, for all properties use <a href="/services/lambda/aliases/"><code>aliases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>aliases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lambda::Alias</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lambda.aliases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "alias_arn",
-    "type": "string",
-    "description": "Lambda Alias ARN generated by the service."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>aliases</code> in a region.
-```sql
-SELECT
-region,
-alias_arn
-FROM awscc.lambda.aliases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>aliases_list_only</code> resource, see <a href="/services/lambda/aliases/#permissions"><code>aliases</code></a>
-
diff --git a/website/docs/services/lambda/code_signing_configs/index.md b/website/docs/services/lambda/code_signing_configs/index.md
index ea8e7a116..ea354ded0 100644
--- a/website/docs/services/lambda/code_signing_configs/index.md
+++ b/website/docs/services/lambda/code_signing_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>code_signing_config</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -96,6 +105,23 @@ Creates, updates, deletes or gets a <code>code_signing_config</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "code_signing_config_arn",
+    "type": "string",
+    "description": "A unique Arn for CodeSigningConfig resource"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-codesigningconfig.html"><code>AWS::Lambda::CodeSigningConfig</code></a>.
 
@@ -105,31 +131,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>code_signing_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AllowedPublishers, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>code_signing_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>code_signing_configs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>code_signing_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>code_signing_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -138,6 +170,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>code_signing_config</code>.
 ```sql
 SELECT
@@ -151,6 +192,19 @@ tags
 FROM awscc.lambda.code_signing_configs
 WHERE region = 'us-east-1' AND data__Identifier = '<CodeSigningConfigArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>code_signing_configs</code> in a region.
+```sql
+SELECT
+region,
+code_signing_config_arn
+FROM awscc.lambda.code_signing_configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -228,6 +282,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lambda.code_signing_configs
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "AllowedPublishers": allowed_publishers,
+    "CodeSigningPolicies": code_signing_policies,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CodeSigningConfigArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lambda/code_signing_configs_list_only/index.md b/website/docs/services/lambda/code_signing_configs_list_only/index.md
deleted file mode 100644
index 0e539ec7f..000000000
--- a/website/docs/services/lambda/code_signing_configs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: code_signing_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - code_signing_configs_list_only
-  - lambda
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>code_signing_configs</code> in a region or regions, for all properties use <a href="/services/lambda/code_signing_configs/"><code>code_signing_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>code_signing_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lambda::CodeSigningConfig.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lambda.code_signing_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "code_signing_config_arn",
-    "type": "string",
-    "description": "A unique Arn for CodeSigningConfig resource"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>code_signing_configs</code> in a region.
-```sql
-SELECT
-region,
-code_signing_config_arn
-FROM awscc.lambda.code_signing_configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>code_signing_configs_list_only</code> resource, see <a href="/services/lambda/code_signing_configs/#permissions"><code>code_signing_configs</code></a>
-
diff --git a/website/docs/services/lambda/event_invoke_configs/index.md b/website/docs/services/lambda/event_invoke_configs/index.md
index c18f62e8b..92b70ddf7 100644
--- a/website/docs/services/lambda/event_invoke_configs/index.md
+++ b/website/docs/services/lambda/event_invoke_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>event_invoke_config</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "destination_config",
@@ -79,6 +88,28 @@ Creates, updates, deletes or gets an <code>event_invoke_config</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "function_name",
+    "type": "string",
+    "description": "The name of the Lambda function."
+  },
+  {
+    "name": "qualifier",
+    "type": "string",
+    "description": "The identifier of a version or alias."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventinvokeconfig.html"><code>AWS::Lambda::EventInvokeConfig</code></a>.
 
@@ -88,31 +119,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>event_invoke_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FunctionName, Qualifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>event_invoke_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>event_invoke_configs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>event_invoke_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>event_invoke_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -121,6 +158,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>event_invoke_config</code>.
 ```sql
 SELECT
@@ -133,6 +179,20 @@ qualifier
 FROM awscc.lambda.event_invoke_configs
 WHERE region = 'us-east-1' AND data__Identifier = '<FunctionName>|<Qualifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>event_invoke_configs</code> in a region.
+```sql
+SELECT
+region,
+function_name,
+qualifier
+FROM awscc.lambda.event_invoke_configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -213,6 +273,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lambda.event_invoke_configs
+SET data__PatchDocument = string('{{ {
+    "DestinationConfig": destination_config,
+    "MaximumEventAgeInSeconds": maximum_event_age_in_seconds,
+    "MaximumRetryAttempts": maximum_retry_attempts
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FunctionName>|<Qualifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lambda/event_invoke_configs_list_only/index.md b/website/docs/services/lambda/event_invoke_configs_list_only/index.md
deleted file mode 100644
index 61dd94e43..000000000
--- a/website/docs/services/lambda/event_invoke_configs_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: event_invoke_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - event_invoke_configs_list_only
-  - lambda
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>event_invoke_configs</code> in a region or regions, for all properties use <a href="/services/lambda/event_invoke_configs/"><code>event_invoke_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>event_invoke_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Lambda::EventInvokeConfig resource configures options for asynchronous invocation on a version or an alias.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lambda.event_invoke_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "function_name",
-    "type": "string",
-    "description": "The name of the Lambda function."
-  },
-  {
-    "name": "qualifier",
-    "type": "string",
-    "description": "The identifier of a version or alias."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>event_invoke_configs</code> in a region.
-```sql
-SELECT
-region,
-function_name,
-qualifier
-FROM awscc.lambda.event_invoke_configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>event_invoke_configs_list_only</code> resource, see <a href="/services/lambda/event_invoke_configs/#permissions"><code>event_invoke_configs</code></a>
-
diff --git a/website/docs/services/lambda/event_source_mappings/index.md b/website/docs/services/lambda/event_source_mappings/index.md
index 5d972590c..4dfb99e16 100644
--- a/website/docs/services/lambda/event_source_mappings/index.md
+++ b/website/docs/services/lambda/event_source_mappings/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>event_source_mapping</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -400,6 +409,23 @@ Creates, updates, deletes or gets an <code>event_source_mapping</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html"><code>AWS::Lambda::EventSourceMapping</code></a>.
 
@@ -409,31 +435,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>event_source_mappings</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FunctionName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>event_source_mappings</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>event_source_mappings</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>event_source_mappings_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>event_source_mappings</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -442,6 +474,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>event_source_mapping</code>.
 ```sql
 SELECT
@@ -478,6 +519,19 @@ metrics_config
 FROM awscc.lambda.event_source_mappings
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>event_source_mappings</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.lambda.event_source_mappings_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -675,6 +729,41 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lambda.event_source_mappings
+SET data__PatchDocument = string('{{ {
+    "BatchSize": batch_size,
+    "BisectBatchOnFunctionError": bisect_batch_on_function_error,
+    "DestinationConfig": destination_config,
+    "Enabled": enabled,
+    "FilterCriteria": filter_criteria,
+    "KmsKeyArn": kms_key_arn,
+    "FunctionName": function_name,
+    "MaximumBatchingWindowInSeconds": maximum_batching_window_in_seconds,
+    "MaximumRecordAgeInSeconds": maximum_record_age_in_seconds,
+    "MaximumRetryAttempts": maximum_retry_attempts,
+    "ParallelizationFactor": parallelization_factor,
+    "Tags": tags,
+    "Topics": topics,
+    "Queues": queues,
+    "SourceAccessConfigurations": source_access_configurations,
+    "TumblingWindowInSeconds": tumbling_window_in_seconds,
+    "FunctionResponseTypes": function_response_types,
+    "AmazonManagedKafkaEventSourceConfig": amazon_managed_kafka_event_source_config,
+    "SelfManagedKafkaEventSourceConfig": self_managed_kafka_event_source_config,
+    "ScalingConfig": scaling_config,
+    "DocumentDBEventSourceConfig": document_db_event_source_config,
+    "ProvisionedPollerConfig": provisioned_poller_config,
+    "MetricsConfig": metrics_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lambda/event_source_mappings_list_only/index.md b/website/docs/services/lambda/event_source_mappings_list_only/index.md
deleted file mode 100644
index 86c7afeb6..000000000
--- a/website/docs/services/lambda/event_source_mappings_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: event_source_mappings_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - event_source_mappings_list_only
-  - lambda
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>event_source_mappings</code> in a region or regions, for all properties use <a href="/services/lambda/event_source_mappings/"><code>event_source_mappings</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>event_source_mappings_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::Lambda::EventSourceMapping&#96;&#96; resource creates a mapping between an event source and an LAMlong function. LAM reads items from the event source and triggers the function.<br />For details about each event source type, see the following topics. In particular, each of the topics describes the required and optional parameters for the specific event source. <br />+ &#91;Configuring a Dynamo DB stream as an event source&#93;(https://docs.aws.amazon.com/lambda/latest/dg/with-ddb.html#services-dynamodb-eventsourcemapping) <br />+ &#91;Configuring a Kinesis stream as an event source&#93;(https://docs.aws.amazon.com/lambda/latest/dg/with-kinesis.html#services-kinesis-eventsourcemapping) <br />+ &#91;Configuring an SQS queue as an event source&#93;(https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html#events-sqs-eventsource) <br />+ &#91;Configuring an MQ broker as an event source&#93;(https://docs.aws.amazon.com/lambda/latest/dg/with-mq.html#services-mq-eventsourcemapping) <br />+ &#91;Configuring MSK as an event source&#93;(https://docs.aws.amazon.com/lambda/latest/dg/with-msk.html) <br />+ &#91;Configuring Self-Managed Apache Kafka as an event source&#93;(https://docs.aws.amazon.com/lambda/latest/dg/kafka-smaa.html) <br />+ &#91;Configuring Amazon DocumentDB as an event source&#93;(https://docs.aws.amazon.com/lambda/latest/dg/with-documentdb.html)</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lambda.event_source_mappings_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>event_source_mappings</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.lambda.event_source_mappings_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>event_source_mappings_list_only</code> resource, see <a href="/services/lambda/event_source_mappings/#permissions"><code>event_source_mappings</code></a>
-
diff --git a/website/docs/services/lambda/functions/index.md b/website/docs/services/lambda/functions/index.md
index 9c553f429..cc412e9c3 100644
--- a/website/docs/services/lambda/functions/index.md
+++ b/website/docs/services/lambda/functions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>function</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -351,6 +360,23 @@ Creates, updates, deletes or gets a <code>function</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "function_name",
+    "type": "string",
+    "description": "The name of the Lambda function, up to 64 characters in length. If you don't specify a name, CFN generates one.<br />If you specify a name, you cannot perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html"><code>AWS::Lambda::Function</code></a>.
 
@@ -360,31 +386,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>functions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Code, Role, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>functions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>functions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>functions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>functions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -393,6 +425,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>function</code>.
 ```sql
 SELECT
@@ -428,6 +469,19 @@ architectures
 FROM awscc.lambda.functions
 WHERE region = 'us-east-1' AND data__Identifier = '<FunctionName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>functions</code> in a region.
+```sql
+SELECT
+region,
+function_name
+FROM awscc.lambda.functions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -623,6 +677,42 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lambda.functions
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "TracingConfig": tracing_config,
+    "VpcConfig": vpc_config,
+    "RuntimeManagementConfig": runtime_management_config,
+    "ReservedConcurrentExecutions": reserved_concurrent_executions,
+    "SnapStart": snap_start,
+    "FileSystemConfigs": file_system_configs,
+    "Runtime": runtime,
+    "KmsKeyArn": kms_key_arn,
+    "CodeSigningConfigArn": code_signing_config_arn,
+    "Layers": layers,
+    "Tags": tags,
+    "ImageConfig": image_config,
+    "MemorySize": memory_size,
+    "DeadLetterConfig": dead_letter_config,
+    "Timeout": timeout,
+    "Handler": handler,
+    "Code": code,
+    "Role": role,
+    "LoggingConfig": logging_config,
+    "RecursiveLoop": recursive_loop,
+    "Environment": environment,
+    "EphemeralStorage": ephemeral_storage,
+    "Architectures": architectures
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FunctionName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lambda/functions_list_only/index.md b/website/docs/services/lambda/functions_list_only/index.md
deleted file mode 100644
index 9b5c72a52..000000000
--- a/website/docs/services/lambda/functions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: functions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - functions_list_only
-  - lambda
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>functions</code> in a region or regions, for all properties use <a href="/services/lambda/functions/"><code>functions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>functions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::Lambda::Function&#96;&#96; resource creates a Lambda function. To create a function, you need a &#91;deployment package&#93;(https://docs.aws.amazon.com/lambda/latest/dg/gettingstarted-package.html) and an &#91;execution role&#93;(https://docs.aws.amazon.com/lambda/latest/dg/lambda-intro-execution-role.html). The deployment package is a .zip file archive or container image that contains your function code. The execution role grants the function permission to use AWS services, such as Amazon CloudWatch Logs for log streaming and AWS X-Ray for request tracing.<br />You set the package type to &#96;&#96;Image&#96;&#96; if the deployment package is a &#91;container image&#93;(https://docs.aws.amazon.com/lambda/latest/dg/lambda-images.html). For these functions, include the URI of the container image in the ECR registry in the &#91;ImageUri property of the Code property&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#cfn-lambda-function-code-imageuri). You do not need to specify the handler and runtime properties. <br />You set the package type to &#96;&#96;Zip&#96;&#96; if the deployment package is a &#91;.zip file archive&#93;(https://docs.aws.amazon.com/lambda/latest/dg/gettingstarted-package.html#gettingstarted-package-zip). For these functions, specify the S3 location of your .zip file in the &#96;&#96;Code&#96;&#96; property. Alternatively, for Node.js and Python functions, you can define your function inline in the &#91;ZipFile property of the Code property&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#cfn-lambda-function-code-zipfile). In both cases, you must also specify the handler and runtime properties.<br />You can use &#91;code signing&#93;(https://docs.aws.amazon.com/lambda/latest/dg/configuration-codesigning.html) if your deployment package is a .zip file archive. To enable code signing for this function, specify the ARN of a code-signing configuration. When a user attempts to deploy a code package with &#96;&#96;UpdateFunctionCode&#96;&#96;, Lambda checks that the code package has a valid signature from a trusted publisher. The code-signing configuration includes a set of signing profiles, which define the trusted publishers for this function.<br />When you update a &#96;&#96;AWS::Lambda::Function&#96;&#96; resource, CFNshort calls the &#91;UpdateFunctionConfiguration&#93;(https://docs.aws.amazon.com/lambda/latest/api/API&#95;UpdateFunctionConfiguration.html) and &#91;UpdateFunctionCode&#93;(https://docs.aws.amazon.com/lambda/latest/api/API&#95;UpdateFunctionCode.html)LAM APIs under the hood. Because these calls happen sequentially, and invocations can happen between these calls, your function may encounter errors in the time between the calls. For example, if you remove an environment variable, and the code that references that environment variable in the same CFNshort update, you may see invocation errors related to a missing environment variable. To work around this, you can invoke your function against a version or alias by default, rather than the &#96;&#96;$LATEST&#96;&#96; version.<br />Note that you configure &#91;provisioned concurrency&#93;(https://docs.aws.amazon.com/lambda/latest/dg/provisioned-concurrency.html) on a &#96;&#96;AWS::Lambda::Version&#96;&#96; or a &#96;&#96;AWS::Lambda::Alias&#96;&#96;.<br />For a complete introduction to Lambda functions, see &#91;What is Lambda?&#93;(https://docs.aws.amazon.com/lambda/latest/dg/lambda-welcome.html) in the &#42;Lambda developer guide.&#42;</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lambda.functions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "function_name",
-    "type": "string",
-    "description": "The name of the Lambda function, up to 64 characters in length. If you don't specify a name, CFN generates one.<br />If you specify a name, you cannot perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>functions</code> in a region.
-```sql
-SELECT
-region,
-function_name
-FROM awscc.lambda.functions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>functions_list_only</code> resource, see <a href="/services/lambda/functions/#permissions"><code>functions</code></a>
-
diff --git a/website/docs/services/lambda/index.md b/website/docs/services/lambda/index.md
index bf5179a51..7fa9eaf79 100644
--- a/website/docs/services/lambda/index.md
+++ b/website/docs/services/lambda/index.md
@@ -20,7 +20,7 @@ The lambda service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>20</b></span><br />
+<span>total resources:&nbsp;<b>10</b></span><br />
 </div>
 </div>
 
@@ -30,26 +30,16 @@ The lambda service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/lambda/aliases/">aliases</a><br />
-<a href="/services/lambda/aliases_list_only/">aliases_list_only</a><br />
 <a href="/services/lambda/code_signing_configs/">code_signing_configs</a><br />
-<a href="/services/lambda/code_signing_configs_list_only/">code_signing_configs_list_only</a><br />
 <a href="/services/lambda/event_invoke_configs/">event_invoke_configs</a><br />
-<a href="/services/lambda/event_invoke_configs_list_only/">event_invoke_configs_list_only</a><br />
 <a href="/services/lambda/event_source_mappings/">event_source_mappings</a><br />
-<a href="/services/lambda/event_source_mappings_list_only/">event_source_mappings_list_only</a><br />
-<a href="/services/lambda/functions/">functions</a><br />
-<a href="/services/lambda/functions_list_only/">functions_list_only</a>
+<a href="/services/lambda/functions/">functions</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/lambda/layer_version_permissions/">layer_version_permissions</a><br />
-<a href="/services/lambda/layer_version_permissions_list_only/">layer_version_permissions_list_only</a><br />
 <a href="/services/lambda/layer_versions/">layer_versions</a><br />
-<a href="/services/lambda/layer_versions_list_only/">layer_versions_list_only</a><br />
 <a href="/services/lambda/permissions/">permissions</a><br />
-<a href="/services/lambda/permissions_list_only/">permissions_list_only</a><br />
 <a href="/services/lambda/urls/">urls</a><br />
-<a href="/services/lambda/urls_list_only/">urls_list_only</a><br />
-<a href="/services/lambda/versions/">versions</a><br />
-<a href="/services/lambda/versions_list_only/">versions_list_only</a>
+<a href="/services/lambda/versions/">versions</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/lambda/layer_version_permissions/index.md b/website/docs/services/lambda/layer_version_permissions/index.md
index 60b4c29a7..9e23dfd67 100644
--- a/website/docs/services/lambda/layer_version_permissions/index.md
+++ b/website/docs/services/lambda/layer_version_permissions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>layer_version_permission</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -65,6 +74,23 @@ Creates, updates, deletes or gets a <code>layer_version_permission</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "ID generated by service"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-layerversionpermission.html"><code>AWS::Lambda::LayerVersionPermission</code></a>.
 
@@ -74,26 +100,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>layer_version_permissions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LayerVersionArn, Action, Principal, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>layer_version_permissions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>layer_version_permissions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>layer_version_permissions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +133,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>layer_version_permission</code>.
 ```sql
 SELECT
@@ -114,6 +154,19 @@ principal
 FROM awscc.lambda.layer_version_permissions
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>layer_version_permissions</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.lambda.layer_version_permissions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -190,6 +243,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lambda/layer_version_permissions_list_only/index.md b/website/docs/services/lambda/layer_version_permissions_list_only/index.md
deleted file mode 100644
index 54ecaf838..000000000
--- a/website/docs/services/lambda/layer_version_permissions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: layer_version_permissions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - layer_version_permissions_list_only
-  - lambda
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>layer_version_permissions</code> in a region or regions, for all properties use <a href="/services/lambda/layer_version_permissions/"><code>layer_version_permissions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>layer_version_permissions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Schema for Lambda LayerVersionPermission</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lambda.layer_version_permissions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "ID generated by service"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>layer_version_permissions</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.lambda.layer_version_permissions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>layer_version_permissions_list_only</code> resource, see <a href="/services/lambda/layer_version_permissions/#permissions"><code>layer_version_permissions</code></a>
-
diff --git a/website/docs/services/lambda/layer_versions/index.md b/website/docs/services/lambda/layer_versions/index.md
index 67e888b39..2cca56548 100644
--- a/website/docs/services/lambda/layer_versions/index.md
+++ b/website/docs/services/lambda/layer_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>layer_version</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "compatible_runtimes",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>layer_version</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "layer_version_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-layerversion.html"><code>AWS::Lambda::LayerVersion</code></a>.
 
@@ -101,26 +127,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>layer_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Content, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>layer_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>layer_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>layer_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +160,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>layer_version</code>.
 ```sql
 SELECT
@@ -143,6 +183,19 @@ compatible_architectures
 FROM awscc.lambda.layer_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<LayerVersionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>layer_versions</code> in a region.
+```sql
+SELECT
+region,
+layer_version_arn
+FROM awscc.lambda.layer_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -228,6 +281,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lambda/layer_versions_list_only/index.md b/website/docs/services/lambda/layer_versions_list_only/index.md
deleted file mode 100644
index 0c1283813..000000000
--- a/website/docs/services/lambda/layer_versions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: layer_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - layer_versions_list_only
-  - lambda
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>layer_versions</code> in a region or regions, for all properties use <a href="/services/lambda/layer_versions/"><code>layer_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>layer_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lambda::LayerVersion</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lambda.layer_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "layer_version_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>layer_versions</code> in a region.
-```sql
-SELECT
-region,
-layer_version_arn
-FROM awscc.lambda.layer_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>layer_versions_list_only</code> resource, see <a href="/services/lambda/layer_versions/#permissions"><code>layer_versions</code></a>
-
diff --git a/website/docs/services/lambda/permissions/index.md b/website/docs/services/lambda/permissions/index.md
index 7cf8e3df1..826f76cf3 100644
--- a/website/docs/services/lambda/permissions/index.md
+++ b/website/docs/services/lambda/permissions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>permission</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "function_name",
@@ -85,6 +94,28 @@ Creates, updates, deletes or gets a <code>permission</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "function_name",
+    "type": "string",
+    "description": "The name or ARN of the Lambda function, version, or alias.<br />&#42;&#42;Name formats&#42;&#42;<br />+ &#42;Function name&#42; – &#96;&#96;my-function&#96;&#96; (name-only), &#96;&#96;my-function:v1&#96;&#96; (with alias).<br />+ &#42;Function ARN&#42; – &#96;&#96;arn:aws:lambda:us-west-2:123456789012:function:my-function&#96;&#96;.<br />+ &#42;Partial ARN&#42; – &#96;&#96;123456789012:function:my-function&#96;&#96;.<br /><br />You can append a version number or alias to any of the formats. The length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html"><code>AWS::Lambda::Permission</code></a>.
 
@@ -94,26 +125,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>permissions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FunctionName, Action, Principal, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>permissions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>permissions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>permissions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -122,6 +158,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>permission</code>.
 ```sql
 SELECT
@@ -138,6 +183,20 @@ principal
 FROM awscc.lambda.permissions
 WHERE region = 'us-east-1' AND data__Identifier = '<FunctionName>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>permissions</code> in a region.
+```sql
+SELECT
+region,
+function_name,
+id
+FROM awscc.lambda.permissions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -230,6 +289,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lambda/permissions_list_only/index.md b/website/docs/services/lambda/permissions_list_only/index.md
deleted file mode 100644
index 12a2dd246..000000000
--- a/website/docs/services/lambda/permissions_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: permissions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - permissions_list_only
-  - lambda
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>permissions</code> in a region or regions, for all properties use <a href="/services/lambda/permissions/"><code>permissions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>permissions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::Lambda::Permission&#96;&#96; resource grants an AWS service or another account permission to use a function. You can apply the policy at the function level, or specify a qualifier to restrict access to a single version or alias. If you use a qualifier, the invoker must use the full Amazon Resource Name (ARN) of that version or alias to invoke the function.<br />To grant permission to another account, specify the account ID as the &#96;&#96;Principal&#96;&#96;. To grant permission to an organization defined in AOlong, specify the organization ID as the &#96;&#96;PrincipalOrgID&#96;&#96;. For AWS services, the principal is a domain-style identifier defined by the service, like &#96;&#96;s3.amazonaws.com&#96;&#96; or &#96;&#96;sns.amazonaws.com&#96;&#96;. For AWS services, you can also specify the ARN of the associated resource as the &#96;&#96;SourceArn&#96;&#96;. If you grant permission to a service principal without specifying the source, other accounts could potentially configure resources in their account to invoke your Lambda function.<br />If your function has a function URL, you can specify the &#96;&#96;FunctionUrlAuthType&#96;&#96; parameter. This adds a condition to your permission that only applies when your function URL's &#96;&#96;AuthType&#96;&#96; matches the specified &#96;&#96;FunctionUrlAuthType&#96;&#96;. For more information about the &#96;&#96;AuthType&#96;&#96; parameter, see &#91;Security and auth model for function URLs&#93;(https://docs.aws.amazon.com/lambda/latest/dg/urls-auth.html).<br />This resource adds a statement to a resource-based permission policy for the function. For more information about function policies, see &#91;Lambda Function Policies&#93;(https://docs.aws.amazon.com/lambda/latest/dg/access-control-resource-based.html).</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lambda.permissions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "function_name",
-    "type": "string",
-    "description": "The name or ARN of the Lambda function, version, or alias.<br />&#42;&#42;Name formats&#42;&#42;<br />+ &#42;Function name&#42; – &#96;&#96;my-function&#96;&#96; (name-only), &#96;&#96;my-function:v1&#96;&#96; (with alias).<br />+ &#42;Function ARN&#42; – &#96;&#96;arn:aws:lambda:us-west-2:123456789012:function:my-function&#96;&#96;.<br />+ &#42;Partial ARN&#42; – &#96;&#96;123456789012:function:my-function&#96;&#96;.<br /><br />You can append a version number or alias to any of the formats. The length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>permissions</code> in a region.
-```sql
-SELECT
-region,
-function_name,
-id
-FROM awscc.lambda.permissions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>permissions_list_only</code> resource, see <a href="/services/lambda/permissions/#permissions"><code>permissions</code></a>
-
diff --git a/website/docs/services/lambda/urls/index.md b/website/docs/services/lambda/urls/index.md
index ad22b470d..42bfb9a69 100644
--- a/website/docs/services/lambda/urls/index.md
+++ b/website/docs/services/lambda/urls/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>url</code> resource or lists <code>ur
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "target_function_arn",
@@ -107,6 +116,23 @@ Creates, updates, deletes or gets an <code>url</code> resource or lists <code>ur
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "function_arn",
+    "type": "string",
+    "description": "The full Amazon Resource Name (ARN) of the function associated with the Function URL."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-url.html"><code>AWS::Lambda::Url</code></a>.
 
@@ -116,31 +142,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>urls</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TargetFunctionArn, AuthType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>urls</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>urls</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>urls_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>urls</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -149,6 +181,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>url</code>.
 ```sql
 SELECT
@@ -163,6 +204,19 @@ cors
 FROM awscc.lambda.urls
 WHERE region = 'us-east-1' AND data__Identifier = '<FunctionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>urls</code> in a region.
+```sql
+SELECT
+region,
+function_arn
+FROM awscc.lambda.urls_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -251,6 +305,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lambda.urls
+SET data__PatchDocument = string('{{ {
+    "AuthType": auth_type,
+    "InvokeMode": invoke_mode,
+    "Cors": cors
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FunctionArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lambda/urls_list_only/index.md b/website/docs/services/lambda/urls_list_only/index.md
deleted file mode 100644
index df0c3aed3..000000000
--- a/website/docs/services/lambda/urls_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: urls_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - urls_list_only
-  - lambda
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>urls</code> in a region or regions, for all properties use <a href="/services/lambda/urls/"><code>urls</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>urls_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lambda::Url</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lambda.urls_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "function_arn",
-    "type": "string",
-    "description": "The full Amazon Resource Name (ARN) of the function associated with the Function URL."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>urls</code> in a region.
-```sql
-SELECT
-region,
-function_arn
-FROM awscc.lambda.urls_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>urls_list_only</code> resource, see <a href="/services/lambda/urls/#permissions"><code>urls</code></a>
-
diff --git a/website/docs/services/lambda/versions/index.md b/website/docs/services/lambda/versions/index.md
index 3d633140d..ea7e5a75f 100644
--- a/website/docs/services/lambda/versions/index.md
+++ b/website/docs/services/lambda/versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>version</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "function_arn",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets a <code>version</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "function_arn",
+    "type": "string",
+    "description": "The ARN of the version."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-version.html"><code>AWS::Lambda::Version</code></a>.
 
@@ -103,26 +129,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FunctionName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -131,6 +162,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>version</code>.
 ```sql
 SELECT
@@ -145,6 +185,19 @@ runtime_policy
 FROM awscc.lambda.versions
 WHERE region = 'us-east-1' AND data__Identifier = '<FunctionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>versions</code> in a region.
+```sql
+SELECT
+region,
+function_arn
+FROM awscc.lambda.versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -224,6 +277,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lambda/versions_list_only/index.md b/website/docs/services/lambda/versions_list_only/index.md
deleted file mode 100644
index 0cc2e9d0a..000000000
--- a/website/docs/services/lambda/versions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - versions_list_only
-  - lambda
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>versions</code> in a region or regions, for all properties use <a href="/services/lambda/versions/"><code>versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lambda::Version</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lambda.versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "function_arn",
-    "type": "string",
-    "description": "The ARN of the version."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>versions</code> in a region.
-```sql
-SELECT
-region,
-function_arn
-FROM awscc.lambda.versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>versions_list_only</code> resource, see <a href="/services/lambda/versions/#permissions"><code>versions</code></a>
-
diff --git a/website/docs/services/launchwizard/deployments/index.md b/website/docs/services/launchwizard/deployments/index.md
index af57e2df8..c317da527 100644
--- a/website/docs/services/launchwizard/deployments/index.md
+++ b/website/docs/services/launchwizard/deployments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -107,6 +116,23 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "ARN of the LaunchWizard deployment"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-launchwizard-deployment.html"><code>AWS::LaunchWizard::Deployment</code></a>.
 
@@ -116,31 +142,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DeploymentPatternName, Name, WorkloadName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>deployments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -149,6 +181,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>deployment</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ workload_name
 FROM awscc.launchwizard.deployments
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>deployments</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.launchwizard.deployments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -249,6 +303,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.launchwizard.deployments
+SET data__PatchDocument = string('{{ {
+    "Specifications": specifications,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/launchwizard/deployments_list_only/index.md b/website/docs/services/launchwizard/deployments_list_only/index.md
deleted file mode 100644
index 8b72cb13e..000000000
--- a/website/docs/services/launchwizard/deployments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: deployments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - deployments_list_only
-  - launchwizard
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>deployments</code> in a region or regions, for all properties use <a href="/services/launchwizard/deployments/"><code>deployments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>deployments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::LaunchWizard::Deployment Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.launchwizard.deployments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "ARN of the LaunchWizard deployment"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>deployments</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.launchwizard.deployments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>deployments_list_only</code> resource, see <a href="/services/launchwizard/deployments/#permissions"><code>deployments</code></a>
-
diff --git a/website/docs/services/launchwizard/index.md b/website/docs/services/launchwizard/index.md
index e035f502a..8d4242ba0 100644
--- a/website/docs/services/launchwizard/index.md
+++ b/website/docs/services/launchwizard/index.md
@@ -20,7 +20,7 @@ The launchwizard service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The launchwizard service documentation.
 <a href="/services/launchwizard/deployments/">deployments</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/launchwizard/deployments_list_only/">deployments_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/lex/bot_aliases/index.md b/website/docs/services/lex/bot_aliases/index.md
index c2d042260..e7cb2725a 100644
--- a/website/docs/services/lex/bot_aliases/index.md
+++ b/website/docs/services/lex/bot_aliases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>bot_alias</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "bot_alias_id",
@@ -214,6 +223,23 @@ Creates, updates, deletes or gets a <code>bot_alias</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "bot_alias_id",
+    "type": "string",
+    "description": "Unique ID of resource"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lex-botalias.html"><code>AWS::Lex::BotAlias</code></a>.
 
@@ -223,31 +249,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>bot_aliases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="BotId, BotAliasName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>bot_aliases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>bot_aliases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>bot_aliases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>bot_aliases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -256,6 +288,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>bot_alias</code>.
 ```sql
 SELECT
@@ -274,6 +315,20 @@ bot_alias_tags
 FROM awscc.lex.bot_aliases
 WHERE region = 'us-east-1' AND data__Identifier = '<BotAliasId>|<BotId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>bot_aliases</code> in a region.
+```sql
+SELECT
+region,
+bot_alias_id,
+bot_id
+FROM awscc.lex.bot_aliases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -393,6 +448,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lex.bot_aliases
+SET data__PatchDocument = string('{{ {
+    "BotAliasLocaleSettings": bot_alias_locale_settings,
+    "BotAliasName": bot_alias_name,
+    "BotVersion": bot_version,
+    "ConversationLogSettings": conversation_log_settings,
+    "Description": description,
+    "SentimentAnalysisSettings": sentiment_analysis_settings,
+    "BotAliasTags": bot_alias_tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<BotAliasId>|<BotId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lex/bot_aliases_list_only/index.md b/website/docs/services/lex/bot_aliases_list_only/index.md
deleted file mode 100644
index 417dd05fb..000000000
--- a/website/docs/services/lex/bot_aliases_list_only/index.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-title: bot_aliases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - bot_aliases_list_only
-  - lex
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>bot_aliases</code> in a region or regions, for all properties use <a href="/services/lex/bot_aliases/"><code>bot_aliases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>bot_aliases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A Bot Alias enables you to change the version of a bot without updating applications that use the bot</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lex.bot_aliases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "bot_alias_id",
-    "type": "string",
-    "description": "Unique ID of resource"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>bot_aliases</code> in a region.
-```sql
-SELECT
-region,
-bot_alias_id,
-bot_id
-FROM awscc.lex.bot_aliases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>bot_aliases_list_only</code> resource, see <a href="/services/lex/bot_aliases/#permissions"><code>bot_aliases</code></a>
-
diff --git a/website/docs/services/lex/bot_versions/index.md b/website/docs/services/lex/bot_versions/index.md
index 1309e86a0..d3efb0b65 100644
--- a/website/docs/services/lex/bot_versions/index.md
+++ b/website/docs/services/lex/bot_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>bot_version</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "bot_id",
@@ -96,6 +105,52 @@ Creates, updates, deletes or gets a <code>bot_version</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "bot_id",
+    "type": "string",
+    "description": "Unique ID of resource"
+  },
+  {
+    "name": "bot_version",
+    "type": "object",
+    "description": "A version is a numbered snapshot of your work that you can publish for use in different parts of your workflow, such as development, beta deployment, and production.",
+    "children": [
+      {
+        "name": "description",
+        "type": "string",
+        "description": "A description of the version. Use the description to help identify the version in lists."
+      },
+      {
+        "name": "bot_version_locale_specification",
+        "type": "array",
+        "description": "Specifies the locales that Amazon Lex adds to this version. You can choose the Draft version or any other previously published version for each locale.",
+        "children": [
+          {
+            "name": "locale_id",
+            "type": "string",
+            "description": "The identifier of the language and locale that the bot will be used in."
+          },
+          {
+            "name": "bot_version_locale_details",
+            "type": "object",
+            "description": "The version of a bot used for a bot locale."
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lex-botversion.html"><code>AWS::Lex::BotVersion</code></a>.
 
@@ -105,26 +160,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>bot_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="BotId, BotVersionLocaleSpecification, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>bot_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>bot_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>bot_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -133,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>bot_version</code>.
 ```sql
 SELECT
@@ -144,6 +213,20 @@ bot_version_locale_specification
 FROM awscc.lex.bot_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<BotId>|<BotVersion>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>bot_versions</code> in a region.
+```sql
+SELECT
+region,
+bot_id,
+bot_version
+FROM awscc.lex.bot_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -220,6 +303,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lex/bot_versions_list_only/index.md b/website/docs/services/lex/bot_versions_list_only/index.md
deleted file mode 100644
index 7b2a977c7..000000000
--- a/website/docs/services/lex/bot_versions_list_only/index.md
+++ /dev/null
@@ -1,110 +0,0 @@
----
-title: bot_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - bot_versions_list_only
-  - lex
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>bot_versions</code> in a region or regions, for all properties use <a href="/services/lex/bot_versions/"><code>bot_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>bot_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A version is a numbered snapshot of your work that you can publish for use in different parts of your workflow, such as development, beta deployment, and production.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lex.bot_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "bot_id",
-    "type": "string",
-    "description": "Unique ID of resource"
-  },
-  {
-    "name": "bot_version",
-    "type": "object",
-    "description": "A version is a numbered snapshot of your work that you can publish for use in different parts of your workflow, such as development, beta deployment, and production.",
-    "children": [
-      {
-        "name": "description",
-        "type": "string",
-        "description": "A description of the version. Use the description to help identify the version in lists."
-      },
-      {
-        "name": "bot_version_locale_specification",
-        "type": "array",
-        "description": "Specifies the locales that Amazon Lex adds to this version. You can choose the Draft version or any other previously published version for each locale.",
-        "children": [
-          {
-            "name": "locale_id",
-            "type": "string",
-            "description": "The identifier of the language and locale that the bot will be used in."
-          },
-          {
-            "name": "bot_version_locale_details",
-            "type": "object",
-            "description": "The version of a bot used for a bot locale."
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>bot_versions</code> in a region.
-```sql
-SELECT
-region,
-bot_id,
-bot_version
-FROM awscc.lex.bot_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>bot_versions_list_only</code> resource, see <a href="/services/lex/bot_versions/#permissions"><code>bot_versions</code></a>
-
diff --git a/website/docs/services/lex/bots/index.md b/website/docs/services/lex/bots/index.md
index b46617a61..0a2d8d6b7 100644
--- a/website/docs/services/lex/bots/index.md
+++ b/website/docs/services/lex/bots/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>bot</code> resource or lists <code>bot
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -716,6 +725,23 @@ Creates, updates, deletes or gets a <code>bot</code> resource or lists <code>bot
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Unique ID of resource"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lex-bot.html"><code>AWS::Lex::Bot</code></a>.
 
@@ -725,31 +751,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>bots</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, RoleArn, DataPrivacy, IdleSessionTTLInSeconds, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>bots</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>bots</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>bots_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>bots</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -758,6 +790,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>bot</code>.
 ```sql
 SELECT
@@ -780,6 +821,19 @@ replication
 FROM awscc.lex.bots
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>bots</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.lex.bots_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1187,6 +1241,31 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lex.bots
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "RoleArn": role_arn,
+    "DataPrivacy": data_privacy,
+    "ErrorLogSettings": error_log_settings,
+    "IdleSessionTTLInSeconds": idle_session_ttl_in_seconds,
+    "BotLocales": bot_locales,
+    "BotFileS3Location": bot_file_s3_location,
+    "BotTags": bot_tags,
+    "TestBotAliasTags": test_bot_alias_tags,
+    "AutoBuildBotLocales": auto_build_bot_locales,
+    "TestBotAliasSettings": test_bot_alias_settings,
+    "Replication": replication
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lex/bots_list_only/index.md b/website/docs/services/lex/bots_list_only/index.md
deleted file mode 100644
index 0bd62626f..000000000
--- a/website/docs/services/lex/bots_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: bots_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - bots_list_only
-  - lex
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>bots</code> in a region or regions, for all properties use <a href="/services/lex/bots/"><code>bots</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>bots_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Amazon Lex conversational bot performing automated tasks such as ordering a pizza, booking a hotel, and so on.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lex.bots_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Unique ID of resource"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>bots</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.lex.bots_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>bots_list_only</code> resource, see <a href="/services/lex/bots/#permissions"><code>bots</code></a>
-
diff --git a/website/docs/services/lex/index.md b/website/docs/services/lex/index.md
index e4c7a141e..9b453ca21 100644
--- a/website/docs/services/lex/index.md
+++ b/website/docs/services/lex/index.md
@@ -20,7 +20,7 @@ The lex service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The lex service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/lex/bot_aliases/">bot_aliases</a><br />
-<a href="/services/lex/bot_aliases_list_only/">bot_aliases_list_only</a><br />
-<a href="/services/lex/bot_versions/">bot_versions</a><br />
-<a href="/services/lex/bot_versions_list_only/">bot_versions_list_only</a>
+<a href="/services/lex/bot_versions/">bot_versions</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/lex/bots/">bots</a><br />
-<a href="/services/lex/bots_list_only/">bots_list_only</a><br />
-<a href="/services/lex/resource_policies/">resource_policies</a><br />
-<a href="/services/lex/resource_policies_list_only/">resource_policies_list_only</a>
+<a href="/services/lex/resource_policies/">resource_policies</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/lex/resource_policies/index.md b/website/docs/services/lex/resource_policies/index.md
index 3681d44cd..1ed0d7211 100644
--- a/website/docs/services/lex/resource_policies/index.md
+++ b/website/docs/services/lex/resource_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_policy</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "resource_arn",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets a <code>resource_policy</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The Physical ID of the resource policy."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lex-resourcepolicy.html"><code>AWS::Lex::ResourcePolicy</code></a>.
 
@@ -69,31 +95,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResourceArn, Policy, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +134,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_policy</code>.
 ```sql
 SELECT
@@ -113,6 +154,19 @@ id
 FROM awscc.lex.resource_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_policies</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.lex.resource_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -179,6 +233,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lex.resource_policies
+SET data__PatchDocument = string('{{ {
+    "ResourceArn": resource_arn,
+    "Policy": policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lex/resource_policies_list_only/index.md b/website/docs/services/lex/resource_policies_list_only/index.md
deleted file mode 100644
index 22ce5d012..000000000
--- a/website/docs/services/lex/resource_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_policies_list_only
-  - lex
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_policies</code> in a region or regions, for all properties use <a href="/services/lex/resource_policies/"><code>resource_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A resource policy with specified policy statements that attaches to a Lex bot or bot alias.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lex.resource_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The Physical ID of the resource policy."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_policies</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.lex.resource_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_policies_list_only</code> resource, see <a href="/services/lex/resource_policies/#permissions"><code>resource_policies</code></a>
-
diff --git a/website/docs/services/licensemanager/grants/index.md b/website/docs/services/licensemanager/grants/index.md
index aa92f0221..4c54be5a2 100644
--- a/website/docs/services/licensemanager/grants/index.md
+++ b/website/docs/services/licensemanager/grants/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>grant</code> resource or lists <code>g
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "grant_arn",
@@ -75,6 +84,23 @@ Creates, updates, deletes or gets a <code>grant</code> resource or lists <code>g
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "grant_arn",
+    "type": "string",
+    "description": "Arn of the grant."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-grant.html"><code>AWS::LicenseManager::Grant</code></a>.
 
@@ -84,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>grants</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>grants</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>grants</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>grants_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>grants</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>grant</code>.
 ```sql
 SELECT
@@ -132,6 +173,19 @@ status
 FROM awscc.licensemanager.grants
 WHERE region = 'us-east-1' AND data__Identifier = '<GrantArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>grants</code> in a region.
+```sql
+SELECT
+region,
+grant_arn
+FROM awscc.licensemanager.grants_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -214,6 +268,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.licensemanager.grants
+SET data__PatchDocument = string('{{ {
+    "GrantName": grant_name,
+    "LicenseArn": license_arn,
+    "HomeRegion": home_region,
+    "AllowedOperations": allowed_operations,
+    "Principals": principals,
+    "Status": status
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<GrantArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/licensemanager/grants_list_only/index.md b/website/docs/services/licensemanager/grants_list_only/index.md
deleted file mode 100644
index f641c14a8..000000000
--- a/website/docs/services/licensemanager/grants_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: grants_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - grants_list_only
-  - licensemanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>grants</code> in a region or regions, for all properties use <a href="/services/licensemanager/grants/"><code>grants</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>grants_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An example resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.licensemanager.grants_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "grant_arn",
-    "type": "string",
-    "description": "Arn of the grant."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>grants</code> in a region.
-```sql
-SELECT
-region,
-grant_arn
-FROM awscc.licensemanager.grants_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>grants_list_only</code> resource, see <a href="/services/licensemanager/grants/#permissions"><code>grants</code></a>
-
diff --git a/website/docs/services/licensemanager/index.md b/website/docs/services/licensemanager/index.md
index 08ee519b9..ccfddd30c 100644
--- a/website/docs/services/licensemanager/index.md
+++ b/website/docs/services/licensemanager/index.md
@@ -20,7 +20,7 @@ The licensemanager service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The licensemanager service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/licensemanager/grants/">grants</a><br />
-<a href="/services/licensemanager/grants_list_only/">grants_list_only</a>
+<a href="/services/licensemanager/grants/">grants</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/licensemanager/licenses/">licenses</a><br />
-<a href="/services/licensemanager/licenses_list_only/">licenses_list_only</a>
+<a href="/services/licensemanager/licenses/">licenses</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/licensemanager/licenses/index.md b/website/docs/services/licensemanager/licenses/index.md
index 47772a6c2..a9c1f337f 100644
--- a/website/docs/services/licensemanager/licenses/index.md
+++ b/website/docs/services/licensemanager/licenses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>license</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "product_sku",
@@ -209,6 +218,23 @@ Creates, updates, deletes or gets a <code>license</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "license_arn",
+    "type": "string",
+    "description": "Amazon Resource Name is a unique name for each resource."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-license.html"><code>AWS::LicenseManager::License</code></a>.
 
@@ -218,31 +244,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>licenses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LicenseName, ProductName, Issuer, HomeRegion, Validity, ConsumptionConfiguration, Entitlements, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>licenses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>licenses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>licenses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>licenses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -251,6 +283,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>license</code>.
 ```sql
 SELECT
@@ -271,6 +312,19 @@ version
 FROM awscc.licensemanager.licenses
 WHERE region = 'us-east-1' AND data__Identifier = '<LicenseArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>licenses</code> in a region.
+```sql
+SELECT
+region,
+license_arn
+FROM awscc.licensemanager.licenses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -401,6 +455,29 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.licensemanager.licenses
+SET data__PatchDocument = string('{{ {
+    "ProductSKU": product_sku,
+    "Issuer": issuer,
+    "LicenseName": license_name,
+    "ProductName": product_name,
+    "HomeRegion": home_region,
+    "Validity": validity,
+    "Entitlements": entitlements,
+    "Beneficiary": beneficiary,
+    "ConsumptionConfiguration": consumption_configuration,
+    "LicenseMetadata": license_metadata,
+    "Status": status
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LicenseArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/licensemanager/licenses_list_only/index.md b/website/docs/services/licensemanager/licenses_list_only/index.md
deleted file mode 100644
index d4796286d..000000000
--- a/website/docs/services/licensemanager/licenses_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: licenses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - licenses_list_only
-  - licensemanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>licenses</code> in a region or regions, for all properties use <a href="/services/licensemanager/licenses/"><code>licenses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>licenses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::LicenseManager::License</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.licensemanager.licenses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "license_arn",
-    "type": "string",
-    "description": "Amazon Resource Name is a unique name for each resource."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>licenses</code> in a region.
-```sql
-SELECT
-region,
-license_arn
-FROM awscc.licensemanager.licenses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>licenses_list_only</code> resource, see <a href="/services/licensemanager/licenses/#permissions"><code>licenses</code></a>
-
diff --git a/website/docs/services/lightsail/alarms/index.md b/website/docs/services/lightsail/alarms/index.md
index c3ba3f1e6..e2e963ef0 100644
--- a/website/docs/services/lightsail/alarms/index.md
+++ b/website/docs/services/lightsail/alarms/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>alarm</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "alarm_name",
@@ -105,6 +114,23 @@ Creates, updates, deletes or gets an <code>alarm</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "alarm_name",
+    "type": "string",
+    "description": "The name for the alarm. Specify the name of an existing alarm to update, and overwrite the previous configuration of the alarm."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-alarm.html"><code>AWS::Lightsail::Alarm</code></a>.
 
@@ -114,31 +140,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>alarms</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AlarmName, MonitoredResourceName, MetricName, ComparisonOperator, EvaluationPeriods, Threshold, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>alarms</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>alarms</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>alarms_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>alarms</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -147,6 +179,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>alarm</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ state
 FROM awscc.lightsail.alarms
 WHERE region = 'us-east-1' AND data__Identifier = '<AlarmName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>alarms</code> in a region.
+```sql
+SELECT
+region,
+alarm_name
+FROM awscc.lightsail.alarms_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -279,6 +333,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lightsail.alarms
+SET data__PatchDocument = string('{{ {
+    "ComparisonOperator": comparison_operator,
+    "ContactProtocols": contact_protocols,
+    "DatapointsToAlarm": datapoints_to_alarm,
+    "EvaluationPeriods": evaluation_periods,
+    "NotificationEnabled": notification_enabled,
+    "NotificationTriggers": notification_triggers,
+    "Threshold": threshold,
+    "TreatMissingData": treat_missing_data
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AlarmName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lightsail/alarms_list_only/index.md b/website/docs/services/lightsail/alarms_list_only/index.md
deleted file mode 100644
index 1dc22d061..000000000
--- a/website/docs/services/lightsail/alarms_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: alarms_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - alarms_list_only
-  - lightsail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>alarms</code> in a region or regions, for all properties use <a href="/services/lightsail/alarms/"><code>alarms</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>alarms_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lightsail::Alarm</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lightsail.alarms_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "alarm_name",
-    "type": "string",
-    "description": "The name for the alarm. Specify the name of an existing alarm to update, and overwrite the previous configuration of the alarm."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>alarms</code> in a region.
-```sql
-SELECT
-region,
-alarm_name
-FROM awscc.lightsail.alarms_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>alarms_list_only</code> resource, see <a href="/services/lightsail/alarms/#permissions"><code>alarms</code></a>
-
diff --git a/website/docs/services/lightsail/buckets/index.md b/website/docs/services/lightsail/buckets/index.md
index 971ff6a72..c6fcc753d 100644
--- a/website/docs/services/lightsail/buckets/index.md
+++ b/website/docs/services/lightsail/buckets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>bucket</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "bucket_name",
@@ -114,6 +123,23 @@ Creates, updates, deletes or gets a <code>bucket</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "bucket_name",
+    "type": "string",
+    "description": "The name for the bucket."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-bucket.html"><code>AWS::Lightsail::Bucket</code></a>.
 
@@ -123,31 +149,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>buckets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="BucketName, BundleId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>buckets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>buckets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>buckets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>buckets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +188,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>bucket</code>.
 ```sql
 SELECT
@@ -173,6 +214,19 @@ able_to_update_bundle
 FROM awscc.lightsail.buckets
 WHERE region = 'us-east-1' AND data__Identifier = '<BucketName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>buckets</code> in a region.
+```sql
+SELECT
+region,
+bucket_name
+FROM awscc.lightsail.buckets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -265,6 +319,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lightsail.buckets
+SET data__PatchDocument = string('{{ {
+    "BundleId": bundle_id,
+    "ObjectVersioning": object_versioning,
+    "AccessRules": access_rules,
+    "ResourcesReceivingAccess": resources_receiving_access,
+    "ReadOnlyAccessAccounts": read_only_access_accounts,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<BucketName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lightsail/buckets_list_only/index.md b/website/docs/services/lightsail/buckets_list_only/index.md
deleted file mode 100644
index 3dabe53ca..000000000
--- a/website/docs/services/lightsail/buckets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: buckets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - buckets_list_only
-  - lightsail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>buckets</code> in a region or regions, for all properties use <a href="/services/lightsail/buckets/"><code>buckets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>buckets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lightsail::Bucket</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lightsail.buckets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "bucket_name",
-    "type": "string",
-    "description": "The name for the bucket."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>buckets</code> in a region.
-```sql
-SELECT
-region,
-bucket_name
-FROM awscc.lightsail.buckets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>buckets_list_only</code> resource, see <a href="/services/lightsail/buckets/#permissions"><code>buckets</code></a>
-
diff --git a/website/docs/services/lightsail/certificates/index.md b/website/docs/services/lightsail/certificates/index.md
index 4683fc4f1..1373bf69a 100644
--- a/website/docs/services/lightsail/certificates/index.md
+++ b/website/docs/services/lightsail/certificates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>certificate</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "certificate_name",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>certificate</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "certificate_name",
+    "type": "string",
+    "description": "The name for the certificate."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-certificate.html"><code>AWS::Lightsail::Certificate</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>certificates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CertificateName, DomainName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>certificates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>certificates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>certificates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>certificates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>certificate</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.lightsail.certificates
 WHERE region = 'us-east-1' AND data__Identifier = '<CertificateName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>certificates</code> in a region.
+```sql
+SELECT
+region,
+certificate_name
+FROM awscc.lightsail.certificates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -214,6 +268,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lightsail.certificates
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CertificateName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lightsail/certificates_list_only/index.md b/website/docs/services/lightsail/certificates_list_only/index.md
deleted file mode 100644
index 267af56ee..000000000
--- a/website/docs/services/lightsail/certificates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: certificates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - certificates_list_only
-  - lightsail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>certificates</code> in a region or regions, for all properties use <a href="/services/lightsail/certificates/"><code>certificates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>certificates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lightsail::Certificate.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lightsail.certificates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "certificate_name",
-    "type": "string",
-    "description": "The name for the certificate."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>certificates</code> in a region.
-```sql
-SELECT
-region,
-certificate_name
-FROM awscc.lightsail.certificates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>certificates_list_only</code> resource, see <a href="/services/lightsail/certificates/#permissions"><code>certificates</code></a>
-
diff --git a/website/docs/services/lightsail/containers/index.md b/website/docs/services/lightsail/containers/index.md
index c923e9697..a3d83b6e6 100644
--- a/website/docs/services/lightsail/containers/index.md
+++ b/website/docs/services/lightsail/containers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>container</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "service_name",
@@ -270,6 +279,23 @@ Creates, updates, deletes or gets a <code>container</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "service_name",
+    "type": "string",
+    "description": "The name for the container service."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-container.html"><code>AWS::Lightsail::Container</code></a>.
 
@@ -279,31 +305,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>containers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ServiceName, Power, Scale, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>containers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>containers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>containers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>containers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -312,6 +344,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>container</code>.
 ```sql
 SELECT
@@ -330,6 +371,19 @@ tags
 FROM awscc.lightsail.containers
 WHERE region = 'us-east-1' AND data__Identifier = '<ServiceName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>containers</code> in a region.
+```sql
+SELECT
+region,
+service_name
+FROM awscc.lightsail.containers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -451,6 +505,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lightsail.containers
+SET data__PatchDocument = string('{{ {
+    "Power": power,
+    "Scale": scale,
+    "PublicDomainNames": public_domain_names,
+    "ContainerServiceDeployment": container_service_deployment,
+    "IsDisabled": is_disabled,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ServiceName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lightsail/containers_list_only/index.md b/website/docs/services/lightsail/containers_list_only/index.md
deleted file mode 100644
index d39d15b58..000000000
--- a/website/docs/services/lightsail/containers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: containers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - containers_list_only
-  - lightsail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>containers</code> in a region or regions, for all properties use <a href="/services/lightsail/containers/"><code>containers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>containers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lightsail::Container</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lightsail.containers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "service_name",
-    "type": "string",
-    "description": "The name for the container service."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>containers</code> in a region.
-```sql
-SELECT
-region,
-service_name
-FROM awscc.lightsail.containers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>containers_list_only</code> resource, see <a href="/services/lightsail/containers/#permissions"><code>containers</code></a>
-
diff --git a/website/docs/services/lightsail/databases/index.md b/website/docs/services/lightsail/databases/index.md
index c6b762314..65d7e159e 100644
--- a/website/docs/services/lightsail/databases/index.md
+++ b/website/docs/services/lightsail/databases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>database</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "relational_database_name",
@@ -174,6 +183,23 @@ Creates, updates, deletes or gets a <code>database</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "relational_database_name",
+    "type": "string",
+    "description": "The name to use for your new Lightsail database resource."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html"><code>AWS::Lightsail::Database</code></a>.
 
@@ -183,31 +209,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>databases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RelationalDatabaseName, RelationalDatabaseBlueprintId, RelationalDatabaseBundleId, MasterDatabaseName, MasterUsername, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>databases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>databases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>databases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>databases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -216,6 +248,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>database</code>.
 ```sql
 SELECT
@@ -239,6 +280,19 @@ tags
 FROM awscc.lightsail.databases
 WHERE region = 'us-east-1' AND data__Identifier = '<RelationalDatabaseName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>databases</code> in a region.
+```sql
+SELECT
+region,
+relational_database_name
+FROM awscc.lightsail.databases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -373,6 +427,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lightsail.databases
+SET data__PatchDocument = string('{{ {
+    "MasterUserPassword": master_user_password,
+    "PreferredBackupWindow": preferred_backup_window,
+    "PreferredMaintenanceWindow": preferred_maintenance_window,
+    "PubliclyAccessible": publicly_accessible,
+    "CaCertificateIdentifier": ca_certificate_identifier,
+    "BackupRetention": backup_retention,
+    "RotateMasterUserPassword": rotate_master_user_password,
+    "RelationalDatabaseParameters": relational_database_parameters,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RelationalDatabaseName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lightsail/databases_list_only/index.md b/website/docs/services/lightsail/databases_list_only/index.md
deleted file mode 100644
index 2cb0a7733..000000000
--- a/website/docs/services/lightsail/databases_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: databases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - databases_list_only
-  - lightsail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>databases</code> in a region or regions, for all properties use <a href="/services/lightsail/databases/"><code>databases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>databases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lightsail::Database</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lightsail.databases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "relational_database_name",
-    "type": "string",
-    "description": "The name to use for your new Lightsail database resource."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>databases</code> in a region.
-```sql
-SELECT
-region,
-relational_database_name
-FROM awscc.lightsail.databases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>databases_list_only</code> resource, see <a href="/services/lightsail/databases/#permissions"><code>databases</code></a>
-
diff --git a/website/docs/services/lightsail/distributions/index.md b/website/docs/services/lightsail/distributions/index.md
index 92e547e09..4bbac0fb8 100644
--- a/website/docs/services/lightsail/distributions/index.md
+++ b/website/docs/services/lightsail/distributions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>distribution</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "distribution_name",
@@ -231,6 +240,23 @@ Creates, updates, deletes or gets a <code>distribution</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "distribution_name",
+    "type": "string",
+    "description": "The name for the distribution."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-distribution.html"><code>AWS::Lightsail::Distribution</code></a>.
 
@@ -240,31 +266,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>distributions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DistributionName, BundleId, DefaultCacheBehavior, Origin, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>distributions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>distributions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>distributions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>distributions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -273,6 +305,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>distribution</code>.
 ```sql
 SELECT
@@ -293,6 +334,19 @@ tags
 FROM awscc.lightsail.distributions
 WHERE region = 'us-east-1' AND data__Identifier = '<DistributionName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>distributions</code> in a region.
+```sql
+SELECT
+region,
+distribution_name
+FROM awscc.lightsail.distributions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -420,6 +474,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lightsail.distributions
+SET data__PatchDocument = string('{{ {
+    "BundleId": bundle_id,
+    "CacheBehaviors": cache_behaviors,
+    "CacheBehaviorSettings": cache_behavior_settings,
+    "DefaultCacheBehavior": default_cache_behavior,
+    "Origin": origin,
+    "IsEnabled": is_enabled,
+    "CertificateName": certificate_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DistributionName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lightsail/distributions_list_only/index.md b/website/docs/services/lightsail/distributions_list_only/index.md
deleted file mode 100644
index 28b2d9765..000000000
--- a/website/docs/services/lightsail/distributions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: distributions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - distributions_list_only
-  - lightsail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>distributions</code> in a region or regions, for all properties use <a href="/services/lightsail/distributions/"><code>distributions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>distributions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lightsail::Distribution</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lightsail.distributions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "distribution_name",
-    "type": "string",
-    "description": "The name for the distribution."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>distributions</code> in a region.
-```sql
-SELECT
-region,
-distribution_name
-FROM awscc.lightsail.distributions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>distributions_list_only</code> resource, see <a href="/services/lightsail/distributions/#permissions"><code>distributions</code></a>
-
diff --git a/website/docs/services/lightsail/domains/index.md b/website/docs/services/lightsail/domains/index.md
index 74cec8734..97c1ac72e 100644
--- a/website/docs/services/lightsail/domains/index.md
+++ b/website/docs/services/lightsail/domains/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>domain</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "domain_name",
@@ -131,6 +140,23 @@ Creates, updates, deletes or gets a <code>domain</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_name",
+    "type": "string",
+    "description": "The name of the domain to manage in Lightsail."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-domain.html"><code>AWS::Lightsail::Domain</code></a>.
 
@@ -140,31 +166,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>domains_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -173,6 +205,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>domain</code>.
 ```sql
 SELECT
@@ -188,6 +229,19 @@ tags
 FROM awscc.lightsail.domains
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>domains</code> in a region.
+```sql
+SELECT
+region,
+domain_name
+FROM awscc.lightsail.domains_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -263,6 +317,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lightsail.domains
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lightsail/domains_list_only/index.md b/website/docs/services/lightsail/domains_list_only/index.md
deleted file mode 100644
index 6257d970e..000000000
--- a/website/docs/services/lightsail/domains_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: domains_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - domains_list_only
-  - lightsail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>domains</code> in a region or regions, for all properties use <a href="/services/lightsail/domains/"><code>domains</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>domains_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lightsail::Domain</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lightsail.domains_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_name",
-    "type": "string",
-    "description": "The name of the domain to manage in Lightsail."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>domains</code> in a region.
-```sql
-SELECT
-region,
-domain_name
-FROM awscc.lightsail.domains_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>domains_list_only</code> resource, see <a href="/services/lightsail/domains/#permissions"><code>domains</code></a>
-
diff --git a/website/docs/services/lightsail/index.md b/website/docs/services/lightsail/index.md
index dd5157f34..bf75753c8 100644
--- a/website/docs/services/lightsail/index.md
+++ b/website/docs/services/lightsail/index.md
@@ -20,7 +20,7 @@ The lightsail service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>24</b></span><br />
+<span>total resources:&nbsp;<b>12</b></span><br />
 </div>
 </div>
 
@@ -30,30 +30,18 @@ The lightsail service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/lightsail/alarms/">alarms</a><br />
-<a href="/services/lightsail/alarms_list_only/">alarms_list_only</a><br />
 <a href="/services/lightsail/buckets/">buckets</a><br />
-<a href="/services/lightsail/buckets_list_only/">buckets_list_only</a><br />
 <a href="/services/lightsail/certificates/">certificates</a><br />
-<a href="/services/lightsail/certificates_list_only/">certificates_list_only</a><br />
 <a href="/services/lightsail/containers/">containers</a><br />
-<a href="/services/lightsail/containers_list_only/">containers_list_only</a><br />
 <a href="/services/lightsail/databases/">databases</a><br />
-<a href="/services/lightsail/databases_list_only/">databases_list_only</a><br />
-<a href="/services/lightsail/distributions/">distributions</a><br />
-<a href="/services/lightsail/distributions_list_only/">distributions_list_only</a>
+<a href="/services/lightsail/distributions/">distributions</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/lightsail/domains/">domains</a><br />
-<a href="/services/lightsail/domains_list_only/">domains_list_only</a><br />
 <a href="/services/lightsail/instance_snapshots/">instance_snapshots</a><br />
-<a href="/services/lightsail/instance_snapshots_list_only/">instance_snapshots_list_only</a><br />
 <a href="/services/lightsail/instances/">instances</a><br />
-<a href="/services/lightsail/instances_list_only/">instances_list_only</a><br />
 <a href="/services/lightsail/load_balancer_tls_certificates/">load_balancer_tls_certificates</a><br />
-<a href="/services/lightsail/load_balancer_tls_certificates_list_only/">load_balancer_tls_certificates_list_only</a><br />
 <a href="/services/lightsail/load_balancers/">load_balancers</a><br />
-<a href="/services/lightsail/load_balancers_list_only/">load_balancers_list_only</a><br />
-<a href="/services/lightsail/static_ips/">static_ips</a><br />
-<a href="/services/lightsail/static_ips_list_only/">static_ips_list_only</a>
+<a href="/services/lightsail/static_ips/">static_ips</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/lightsail/instance_snapshots/index.md b/website/docs/services/lightsail/instance_snapshots/index.md
index f24043e62..d13421fca 100644
--- a/website/docs/services/lightsail/instance_snapshots/index.md
+++ b/website/docs/services/lightsail/instance_snapshots/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>instance_snapshot</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_snapshot_name",
@@ -124,6 +133,23 @@ Creates, updates, deletes or gets an <code>instance_snapshot</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "instance_snapshot_name",
+    "type": "string",
+    "description": "The name of the snapshot."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-instancesnapshot.html"><code>AWS::Lightsail::InstanceSnapshot</code></a>.
 
@@ -133,31 +159,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>instance_snapshots</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceSnapshotName, InstanceName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>instance_snapshots</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>instance_snapshots</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>instance_snapshots_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>instance_snapshots</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -166,6 +198,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>instance_snapshot</code>.
 ```sql
 SELECT
@@ -185,6 +226,19 @@ tags
 FROM awscc.lightsail.instance_snapshots
 WHERE region = 'us-east-1' AND data__Identifier = '<InstanceSnapshotName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>instance_snapshots</code> in a region.
+```sql
+SELECT
+region,
+instance_snapshot_name
+FROM awscc.lightsail.instance_snapshots_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -257,6 +311,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lightsail.instance_snapshots
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InstanceSnapshotName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lightsail/instance_snapshots_list_only/index.md b/website/docs/services/lightsail/instance_snapshots_list_only/index.md
deleted file mode 100644
index 01f33d5e0..000000000
--- a/website/docs/services/lightsail/instance_snapshots_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: instance_snapshots_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - instance_snapshots_list_only
-  - lightsail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>instance_snapshots</code> in a region or regions, for all properties use <a href="/services/lightsail/instance_snapshots/"><code>instance_snapshots</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>instance_snapshots_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lightsail::InstanceSnapshot</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lightsail.instance_snapshots_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "instance_snapshot_name",
-    "type": "string",
-    "description": "The name of the snapshot."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>instance_snapshots</code> in a region.
-```sql
-SELECT
-region,
-instance_snapshot_name
-FROM awscc.lightsail.instance_snapshots_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>instance_snapshots_list_only</code> resource, see <a href="/services/lightsail/instance_snapshots/#permissions"><code>instance_snapshots</code></a>
-
diff --git a/website/docs/services/lightsail/instances/index.md b/website/docs/services/lightsail/instances/index.md
index 8356422b1..9104f2a35 100644
--- a/website/docs/services/lightsail/instances/index.md
+++ b/website/docs/services/lightsail/instances/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "support_code",
@@ -330,6 +339,23 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "instance_name",
+    "type": "string",
+    "description": "The names to use for your new Lightsail instance."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-instance.html"><code>AWS::Lightsail::Instance</code></a>.
 
@@ -339,31 +365,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceName, BlueprintId, BundleId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>instances_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -372,6 +404,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>instance</code>.
 ```sql
 SELECT
@@ -400,6 +441,19 @@ instance_arn
 FROM awscc.lightsail.instances
 WHERE region = 'us-east-1' AND data__Identifier = '<InstanceName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>instances</code> in a region.
+```sql
+SELECT
+region,
+instance_name
+FROM awscc.lightsail.instances_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -544,6 +598,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lightsail.instances
+SET data__PatchDocument = string('{{ {
+    "AddOns": add_ons,
+    "UserData": user_data,
+    "KeyPairName": key_pair_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InstanceName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lightsail/instances_list_only/index.md b/website/docs/services/lightsail/instances_list_only/index.md
deleted file mode 100644
index a0f9f3d15..000000000
--- a/website/docs/services/lightsail/instances_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: instances_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - instances_list_only
-  - lightsail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>instances</code> in a region or regions, for all properties use <a href="/services/lightsail/instances/"><code>instances</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>instances_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lightsail::Instance</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lightsail.instances_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "instance_name",
-    "type": "string",
-    "description": "The names to use for your new Lightsail instance."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>instances</code> in a region.
-```sql
-SELECT
-region,
-instance_name
-FROM awscc.lightsail.instances_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>instances_list_only</code> resource, see <a href="/services/lightsail/instances/#permissions"><code>instances</code></a>
-
diff --git a/website/docs/services/lightsail/load_balancer_tls_certificates/index.md b/website/docs/services/lightsail/load_balancer_tls_certificates/index.md
index c2055bc40..de5796489 100644
--- a/website/docs/services/lightsail/load_balancer_tls_certificates/index.md
+++ b/website/docs/services/lightsail/load_balancer_tls_certificates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>load_balancer_tls_certificate</code> r
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "load_balancer_name",
@@ -80,6 +89,28 @@ Creates, updates, deletes or gets a <code>load_balancer_tls_certificate</code> r
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "load_balancer_name",
+    "type": "string",
+    "description": "The name of your load balancer."
+  },
+  {
+    "name": "certificate_name",
+    "type": "string",
+    "description": "The SSL/TLS certificate name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-loadbalancertlscertificate.html"><code>AWS::Lightsail::LoadBalancerTlsCertificate</code></a>.
 
@@ -89,31 +120,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>load_balancer_tls_certificates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LoadBalancerName, CertificateName, CertificateDomainName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>load_balancer_tls_certificates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>load_balancer_tls_certificates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>load_balancer_tls_certificates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>load_balancer_tls_certificates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -122,6 +159,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>load_balancer_tls_certificate</code>.
 ```sql
 SELECT
@@ -137,6 +183,20 @@ status
 FROM awscc.lightsail.load_balancer_tls_certificates
 WHERE region = 'us-east-1' AND data__Identifier = '<CertificateName>|<LoadBalancerName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>load_balancer_tls_certificates</code> in a region.
+```sql
+SELECT
+region,
+certificate_name,
+load_balancer_name
+FROM awscc.lightsail.load_balancer_tls_certificates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -222,6 +282,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lightsail.load_balancer_tls_certificates
+SET data__PatchDocument = string('{{ {
+    "IsAttached": is_attached,
+    "HttpsRedirectionEnabled": https_redirection_enabled
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CertificateName>|<LoadBalancerName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lightsail/load_balancer_tls_certificates_list_only/index.md b/website/docs/services/lightsail/load_balancer_tls_certificates_list_only/index.md
deleted file mode 100644
index c24407142..000000000
--- a/website/docs/services/lightsail/load_balancer_tls_certificates_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: load_balancer_tls_certificates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - load_balancer_tls_certificates_list_only
-  - lightsail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>load_balancer_tls_certificates</code> in a region or regions, for all properties use <a href="/services/lightsail/load_balancer_tls_certificates/"><code>load_balancer_tls_certificates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>load_balancer_tls_certificates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lightsail::LoadBalancerTlsCertificate</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lightsail.load_balancer_tls_certificates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "load_balancer_name",
-    "type": "string",
-    "description": "The name of your load balancer."
-  },
-  {
-    "name": "certificate_name",
-    "type": "string",
-    "description": "The SSL/TLS certificate name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>load_balancer_tls_certificates</code> in a region.
-```sql
-SELECT
-region,
-certificate_name,
-load_balancer_name
-FROM awscc.lightsail.load_balancer_tls_certificates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>load_balancer_tls_certificates_list_only</code> resource, see <a href="/services/lightsail/load_balancer_tls_certificates/#permissions"><code>load_balancer_tls_certificates</code></a>
-
diff --git a/website/docs/services/lightsail/load_balancers/index.md b/website/docs/services/lightsail/load_balancers/index.md
index f38ea8f6c..04cad68c9 100644
--- a/website/docs/services/lightsail/load_balancers/index.md
+++ b/website/docs/services/lightsail/load_balancers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>load_balancer</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "load_balancer_name",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets a <code>load_balancer</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "load_balancer_name",
+    "type": "string",
+    "description": "The name of your load balancer."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-loadbalancer.html"><code>AWS::Lightsail::LoadBalancer</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>load_balancers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LoadBalancerName, InstancePort, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>load_balancers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>load_balancers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>load_balancers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>load_balancers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>load_balancer</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ tags
 FROM awscc.lightsail.load_balancers
 WHERE region = 'us-east-1' AND data__Identifier = '<LoadBalancerName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>load_balancers</code> in a region.
+```sql
+SELECT
+region,
+load_balancer_name
+FROM awscc.lightsail.load_balancers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -258,6 +312,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lightsail.load_balancers
+SET data__PatchDocument = string('{{ {
+    "AttachedInstances": attached_instances,
+    "HealthCheckPath": health_check_path,
+    "SessionStickinessEnabled": session_stickiness_enabled,
+    "SessionStickinessLBCookieDurationSeconds": session_stickiness_lb_cookie_duration_seconds,
+    "TlsPolicyName": tls_policy_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LoadBalancerName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lightsail/load_balancers_list_only/index.md b/website/docs/services/lightsail/load_balancers_list_only/index.md
deleted file mode 100644
index 05a7be6fe..000000000
--- a/website/docs/services/lightsail/load_balancers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: load_balancers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - load_balancers_list_only
-  - lightsail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>load_balancers</code> in a region or regions, for all properties use <a href="/services/lightsail/load_balancers/"><code>load_balancers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>load_balancers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lightsail::LoadBalancer</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lightsail.load_balancers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "load_balancer_name",
-    "type": "string",
-    "description": "The name of your load balancer."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>load_balancers</code> in a region.
-```sql
-SELECT
-region,
-load_balancer_name
-FROM awscc.lightsail.load_balancers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>load_balancers_list_only</code> resource, see <a href="/services/lightsail/load_balancers/#permissions"><code>load_balancers</code></a>
-
diff --git a/website/docs/services/lightsail/static_ips/index.md b/website/docs/services/lightsail/static_ips/index.md
index 33f371e8c..a2c65c60c 100644
--- a/website/docs/services/lightsail/static_ips/index.md
+++ b/website/docs/services/lightsail/static_ips/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>static_ip</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "static_ip_name",
@@ -65,6 +74,23 @@ Creates, updates, deletes or gets a <code>static_ip</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "static_ip_name",
+    "type": "string",
+    "description": "The name of the static IP address."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-staticip.html"><code>AWS::Lightsail::StaticIp</code></a>.
 
@@ -74,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>static_ips</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="StaticIpName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>static_ips</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>static_ips</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>static_ips_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>static_ips</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>static_ip</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ static_ip_arn
 FROM awscc.lightsail.static_ips
 WHERE region = 'us-east-1' AND data__Identifier = '<StaticIpName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>static_ips</code> in a region.
+```sql
+SELECT
+region,
+static_ip_name
+FROM awscc.lightsail.static_ips_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -183,6 +237,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lightsail.static_ips
+SET data__PatchDocument = string('{{ {
+    "AttachedTo": attached_to
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<StaticIpName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lightsail/static_ips_list_only/index.md b/website/docs/services/lightsail/static_ips_list_only/index.md
deleted file mode 100644
index 5915a2538..000000000
--- a/website/docs/services/lightsail/static_ips_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: static_ips_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - static_ips_list_only
-  - lightsail
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>static_ips</code> in a region or regions, for all properties use <a href="/services/lightsail/static_ips/"><code>static_ips</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>static_ips_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lightsail::StaticIp</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lightsail.static_ips_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "static_ip_name",
-    "type": "string",
-    "description": "The name of the static IP address."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>static_ips</code> in a region.
-```sql
-SELECT
-region,
-static_ip_name
-FROM awscc.lightsail.static_ips_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>static_ips_list_only</code> resource, see <a href="/services/lightsail/static_ips/#permissions"><code>static_ips</code></a>
-
diff --git a/website/docs/services/location/api_keys/index.md b/website/docs/services/location/api_keys/index.md
index a39efdab5..8df7c9cdd 100644
--- a/website/docs/services/location/api_keys/index.md
+++ b/website/docs/services/location/api_keys/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>api_key</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "create_time",
@@ -119,6 +128,23 @@ Creates, updates, deletes or gets an <code>api_key</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "key_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-apikey.html"><code>AWS::Location::APIKey</code></a>.
 
@@ -128,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>api_keys</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="KeyName, Restrictions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>api_keys</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>api_keys</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>api_keys_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>api_keys</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>api_key</code>.
 ```sql
 SELECT
@@ -180,6 +221,19 @@ arn
 FROM awscc.location.api_keys
 WHERE region = 'us-east-1' AND data__Identifier = '<KeyName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>api_keys</code> in a region.
+```sql
+SELECT
+region,
+key_name
+FROM awscc.location.api_keys_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -278,6 +332,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.location.api_keys
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "ExpireTime": expire_time,
+    "ForceUpdate": force_update,
+    "NoExpiry": no_expiry,
+    "Restrictions": restrictions,
+    "Tags": tags,
+    "ForceDelete": force_delete
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<KeyName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/location/api_keys_list_only/index.md b/website/docs/services/location/api_keys_list_only/index.md
deleted file mode 100644
index 0926c4014..000000000
--- a/website/docs/services/location/api_keys_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: api_keys_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - api_keys_list_only
-  - location
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>api_keys</code> in a region or regions, for all properties use <a href="/services/location/api_keys/"><code>api_keys</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>api_keys_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Location::APIKey Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.location.api_keys_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "key_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>api_keys</code> in a region.
-```sql
-SELECT
-region,
-key_name
-FROM awscc.location.api_keys_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>api_keys_list_only</code> resource, see <a href="/services/location/api_keys/#permissions"><code>api_keys</code></a>
-
diff --git a/website/docs/services/location/geofence_collections/index.md b/website/docs/services/location/geofence_collections/index.md
index 7b070fbe5..64c7d8bc9 100644
--- a/website/docs/services/location/geofence_collections/index.md
+++ b/website/docs/services/location/geofence_collections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>geofence_collection</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "collection_arn",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>geofence_collection</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "collection_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-geofencecollection.html"><code>AWS::Location::GeofenceCollection</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>geofence_collections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CollectionName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>geofence_collections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>geofence_collections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>geofence_collections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>geofence_collections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>geofence_collection</code>.
 ```sql
 SELECT
@@ -156,6 +197,19 @@ arn
 FROM awscc.location.geofence_collections
 WHERE region = 'us-east-1' AND data__Identifier = '<CollectionName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>geofence_collections</code> in a region.
+```sql
+SELECT
+region,
+collection_name
+FROM awscc.location.geofence_collections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -238,6 +292,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.location.geofence_collections
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "PricingPlan": pricing_plan,
+    "PricingPlanDataSource": pricing_plan_data_source,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CollectionName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/location/geofence_collections_list_only/index.md b/website/docs/services/location/geofence_collections_list_only/index.md
deleted file mode 100644
index 50d3885d9..000000000
--- a/website/docs/services/location/geofence_collections_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: geofence_collections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - geofence_collections_list_only
-  - location
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>geofence_collections</code> in a region or regions, for all properties use <a href="/services/location/geofence_collections/"><code>geofence_collections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>geofence_collections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Location::GeofenceCollection Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.location.geofence_collections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "collection_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>geofence_collections</code> in a region.
-```sql
-SELECT
-region,
-collection_name
-FROM awscc.location.geofence_collections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>geofence_collections_list_only</code> resource, see <a href="/services/location/geofence_collections/#permissions"><code>geofence_collections</code></a>
-
diff --git a/website/docs/services/location/index.md b/website/docs/services/location/index.md
index 89da93edf..1cd9563f1 100644
--- a/website/docs/services/location/index.md
+++ b/website/docs/services/location/index.md
@@ -20,7 +20,7 @@ The location service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>14</b></span><br />
+<span>total resources:&nbsp;<b>7</b></span><br />
 </div>
 </div>
 
@@ -30,20 +30,13 @@ The location service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/location/api_keys/">api_keys</a><br />
-<a href="/services/location/api_keys_list_only/">api_keys_list_only</a><br />
 <a href="/services/location/geofence_collections/">geofence_collections</a><br />
-<a href="/services/location/geofence_collections_list_only/">geofence_collections_list_only</a><br />
 <a href="/services/location/maps/">maps</a><br />
-<a href="/services/location/maps_list_only/">maps_list_only</a><br />
 <a href="/services/location/place_indices/">place_indices</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/location/place_indices_list_only/">place_indices_list_only</a><br />
 <a href="/services/location/route_calculators/">route_calculators</a><br />
-<a href="/services/location/route_calculators_list_only/">route_calculators_list_only</a><br />
 <a href="/services/location/tracker_consumers/">tracker_consumers</a><br />
-<a href="/services/location/tracker_consumers_list_only/">tracker_consumers_list_only</a><br />
-<a href="/services/location/trackers/">trackers</a><br />
-<a href="/services/location/trackers_list_only/">trackers_list_only</a>
+<a href="/services/location/trackers/">trackers</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/location/maps/index.md b/website/docs/services/location/maps/index.md
index 2afe22208..c3f8dc6ba 100644
--- a/website/docs/services/location/maps/index.md
+++ b/website/docs/services/location/maps/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>map</code> resource or lists <code>map
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "configuration",
@@ -109,6 +118,23 @@ Creates, updates, deletes or gets a <code>map</code> resource or lists <code>map
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "map_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-map.html"><code>AWS::Location::Map</code></a>.
 
@@ -118,31 +144,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>maps</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Configuration, MapName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>maps</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>maps</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>maps_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>maps</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +183,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>map</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ arn
 FROM awscc.location.maps
 WHERE region = 'us-east-1' AND data__Identifier = '<MapName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>maps</code> in a region.
+```sql
+SELECT
+region,
+map_name
+FROM awscc.location.maps_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -251,6 +305,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.location.maps
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "PricingPlan": pricing_plan,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<MapName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/location/maps_list_only/index.md b/website/docs/services/location/maps_list_only/index.md
deleted file mode 100644
index 87c5494bd..000000000
--- a/website/docs/services/location/maps_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: maps_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - maps_list_only
-  - location
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>maps</code> in a region or regions, for all properties use <a href="/services/location/maps/"><code>maps</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>maps_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Location::Map Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.location.maps_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "map_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>maps</code> in a region.
-```sql
-SELECT
-region,
-map_name
-FROM awscc.location.maps_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>maps_list_only</code> resource, see <a href="/services/location/maps/#permissions"><code>maps</code></a>
-
diff --git a/website/docs/services/location/place_indices/index.md b/website/docs/services/location/place_indices/index.md
index e0984ff94..a821e9646 100644
--- a/website/docs/services/location/place_indices/index.md
+++ b/website/docs/services/location/place_indices/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>place_index</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "create_time",
@@ -104,6 +113,23 @@ Creates, updates, deletes or gets a <code>place_index</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "index_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-placeindex.html"><code>AWS::Location::PlaceIndex</code></a>.
 
@@ -113,31 +139,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>place_indices</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DataSource, IndexName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>place_indices</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>place_indices</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>place_indices_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>place_indices</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -146,6 +178,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>place_index</code>.
 ```sql
 SELECT
@@ -163,6 +204,19 @@ arn
 FROM awscc.location.place_indices
 WHERE region = 'us-east-1' AND data__Identifier = '<IndexName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>place_indices</code> in a region.
+```sql
+SELECT
+region,
+index_name
+FROM awscc.location.place_indices_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -248,6 +302,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.location.place_indices
+SET data__PatchDocument = string('{{ {
+    "DataSourceConfiguration": data_source_configuration,
+    "Description": description,
+    "PricingPlan": pricing_plan,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IndexName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/location/place_indices_list_only/index.md b/website/docs/services/location/place_indices_list_only/index.md
deleted file mode 100644
index e0c5725bc..000000000
--- a/website/docs/services/location/place_indices_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: place_indices_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - place_indices_list_only
-  - location
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>place_indices</code> in a region or regions, for all properties use <a href="/services/location/place_indices/"><code>place_indices</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>place_indices_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Location::PlaceIndex Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.location.place_indices_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "index_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>place_indices</code> in a region.
-```sql
-SELECT
-region,
-index_name
-FROM awscc.location.place_indices_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>place_indices_list_only</code> resource, see <a href="/services/location/place_indices/#permissions"><code>place_indices</code></a>
-
diff --git a/website/docs/services/location/route_calculators/index.md b/website/docs/services/location/route_calculators/index.md
index f65a85c2b..56f811eea 100644
--- a/website/docs/services/location/route_calculators/index.md
+++ b/website/docs/services/location/route_calculators/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>route_calculator</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "calculator_arn",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>route_calculator</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "calculator_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-routecalculator.html"><code>AWS::Location::RouteCalculator</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>route_calculators</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DataSource, CalculatorName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>route_calculators</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>route_calculators</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>route_calculators_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>route_calculators</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>route_calculator</code>.
 ```sql
 SELECT
@@ -150,6 +191,19 @@ arn
 FROM awscc.location.route_calculators
 WHERE region = 'us-east-1' AND data__Identifier = '<CalculatorName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>route_calculators</code> in a region.
+```sql
+SELECT
+region,
+calculator_name
+FROM awscc.location.route_calculators_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -230,6 +284,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.location.route_calculators
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "PricingPlan": pricing_plan,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CalculatorName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/location/route_calculators_list_only/index.md b/website/docs/services/location/route_calculators_list_only/index.md
deleted file mode 100644
index 1f97d690b..000000000
--- a/website/docs/services/location/route_calculators_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: route_calculators_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - route_calculators_list_only
-  - location
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>route_calculators</code> in a region or regions, for all properties use <a href="/services/location/route_calculators/"><code>route_calculators</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>route_calculators_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Location::RouteCalculator Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.location.route_calculators_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "calculator_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>route_calculators</code> in a region.
-```sql
-SELECT
-region,
-calculator_name
-FROM awscc.location.route_calculators_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>route_calculators_list_only</code> resource, see <a href="/services/location/route_calculators/#permissions"><code>route_calculators</code></a>
-
diff --git a/website/docs/services/location/tracker_consumers/index.md b/website/docs/services/location/tracker_consumers/index.md
index d6cd55157..6e7f3e3d3 100644
--- a/website/docs/services/location/tracker_consumers/index.md
+++ b/website/docs/services/location/tracker_consumers/index.md
@@ -33,6 +33,35 @@ Creates, updates, deletes or gets a <code>tracker_consumer</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "consumer_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "tracker_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "consumer_arn",
@@ -50,6 +79,8 @@ Creates, updates, deletes or gets a <code>tracker_consumer</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-trackerconsumer.html"><code>AWS::Location::TrackerConsumer</code></a>.
 
@@ -59,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>tracker_consumers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConsumerArn, TrackerName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>tracker_consumers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>tracker_consumers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>tracker_consumers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>tracker_consumer</code>.
 ```sql
 SELECT
@@ -96,6 +141,20 @@ tracker_name
 FROM awscc.location.tracker_consumers
 WHERE region = 'us-east-1' AND data__Identifier = '<TrackerName>|<ConsumerArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>tracker_consumers</code> in a region.
+```sql
+SELECT
+region,
+tracker_name,
+consumer_arn
+FROM awscc.location.tracker_consumers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -162,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/location/tracker_consumers_list_only/index.md b/website/docs/services/location/tracker_consumers_list_only/index.md
deleted file mode 100644
index d50a8dd78..000000000
--- a/website/docs/services/location/tracker_consumers_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: tracker_consumers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - tracker_consumers_list_only
-  - location
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>tracker_consumers</code> in a region or regions, for all properties use <a href="/services/location/tracker_consumers/"><code>tracker_consumers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>tracker_consumers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Location::TrackerConsumer Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.location.tracker_consumers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "consumer_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "tracker_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>tracker_consumers</code> in a region.
-```sql
-SELECT
-region,
-tracker_name,
-consumer_arn
-FROM awscc.location.tracker_consumers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>tracker_consumers_list_only</code> resource, see <a href="/services/location/tracker_consumers/#permissions"><code>tracker_consumers</code></a>
-
diff --git a/website/docs/services/location/trackers/index.md b/website/docs/services/location/trackers/index.md
index cf50b8c9e..085eb3ffe 100644
--- a/website/docs/services/location/trackers/index.md
+++ b/website/docs/services/location/trackers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>tracker</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "create_time",
@@ -112,6 +121,23 @@ Creates, updates, deletes or gets a <code>tracker</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "tracker_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-tracker.html"><code>AWS::Location::Tracker</code></a>.
 
@@ -121,31 +147,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>trackers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TrackerName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>trackers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>trackers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>trackers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>trackers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -154,6 +186,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>tracker</code>.
 ```sql
 SELECT
@@ -174,6 +215,19 @@ arn
 FROM awscc.location.trackers
 WHERE region = 'us-east-1' AND data__Identifier = '<TrackerName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>trackers</code> in a region.
+```sql
+SELECT
+region,
+tracker_name
+FROM awscc.location.trackers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -268,6 +322,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.location.trackers
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "EventBridgeEnabled": event_bridge_enabled,
+    "KmsKeyEnableGeospatialQueries": kms_key_enable_geospatial_queries,
+    "PositionFiltering": position_filtering,
+    "PricingPlan": pricing_plan,
+    "PricingPlanDataSource": pricing_plan_data_source,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TrackerName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/location/trackers_list_only/index.md b/website/docs/services/location/trackers_list_only/index.md
deleted file mode 100644
index 1891a0617..000000000
--- a/website/docs/services/location/trackers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: trackers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - trackers_list_only
-  - location
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>trackers</code> in a region or regions, for all properties use <a href="/services/location/trackers/"><code>trackers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>trackers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Location::Tracker Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.location.trackers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "tracker_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>trackers</code> in a region.
-```sql
-SELECT
-region,
-tracker_name
-FROM awscc.location.trackers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>trackers_list_only</code> resource, see <a href="/services/location/trackers/#permissions"><code>trackers</code></a>
-
diff --git a/website/docs/services/logs/account_policies/index.md b/website/docs/services/logs/account_policies/index.md
index 5722b7a88..42671ca6d 100644
--- a/website/docs/services/logs/account_policies/index.md
+++ b/website/docs/services/logs/account_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>account_policy</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "account_id",
@@ -70,6 +79,33 @@ Creates, updates, deletes or gets an <code>account_policy</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "account_id",
+    "type": "string",
+    "description": "User account id"
+  },
+  {
+    "name": "policy_name",
+    "type": "string",
+    "description": "The name of the account policy"
+  },
+  {
+    "name": "policy_type",
+    "type": "string",
+    "description": "Type of the policy."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-accountpolicy.html"><code>AWS::Logs::AccountPolicy</code></a>.
 
@@ -79,31 +115,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>account_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PolicyName, PolicyType, PolicyDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>account_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>account_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>account_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>account_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +154,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>account_policy</code>.
 ```sql
 SELECT
@@ -125,6 +176,21 @@ selection_criteria
 FROM awscc.logs.account_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<AccountId>|<PolicyType>|<PolicyName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>account_policies</code> in a region.
+```sql
+SELECT
+region,
+account_id,
+policy_type,
+policy_name
+FROM awscc.logs.account_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +271,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.logs.account_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyDocument": policy_document,
+    "Scope": scope,
+    "SelectionCriteria": selection_criteria
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccountId>|<PolicyType>|<PolicyName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/logs/account_policies_list_only/index.md b/website/docs/services/logs/account_policies_list_only/index.md
deleted file mode 100644
index 6f0834697..000000000
--- a/website/docs/services/logs/account_policies_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: account_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - account_policies_list_only
-  - logs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>account_policies</code> in a region or regions, for all properties use <a href="/services/logs/account_policies/"><code>account_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>account_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Logs::AccountPolicy resource specifies a CloudWatch Logs AccountPolicy.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.logs.account_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "account_id",
-    "type": "string",
-    "description": "User account id"
-  },
-  {
-    "name": "policy_name",
-    "type": "string",
-    "description": "The name of the account policy"
-  },
-  {
-    "name": "policy_type",
-    "type": "string",
-    "description": "Type of the policy."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>account_policies</code> in a region.
-```sql
-SELECT
-region,
-account_id,
-policy_type,
-policy_name
-FROM awscc.logs.account_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>account_policies_list_only</code> resource, see <a href="/services/logs/account_policies/#permissions"><code>account_policies</code></a>
-
diff --git a/website/docs/services/logs/deliveries/index.md b/website/docs/services/logs/deliveries/index.md
index 5ad462184..011c9665c 100644
--- a/website/docs/services/logs/deliveries/index.md
+++ b/website/docs/services/logs/deliveries/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>delivery</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "delivery_id",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>delivery</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "delivery_id",
+    "type": "string",
+    "description": "The unique ID that identifies this delivery in your account."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-delivery.html"><code>AWS::Logs::Delivery</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>deliveries</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DeliverySourceName, DeliveryDestinationArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>deliveries</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>deliveries</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>deliveries_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>deliveries</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>delivery</code>.
 ```sql
 SELECT
@@ -156,6 +197,19 @@ s3_enable_hive_compatible_path
 FROM awscc.logs.deliveries
 WHERE region = 'us-east-1' AND data__Identifier = '<DeliveryId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>deliveries</code> in a region.
+```sql
+SELECT
+region,
+delivery_id
+FROM awscc.logs.deliveries_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -245,6 +299,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.logs.deliveries
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "RecordFields": record_fields,
+    "FieldDelimiter": field_delimiter,
+    "S3SuffixPath": s3_suffix_path,
+    "S3EnableHiveCompatiblePath": s3_enable_hive_compatible_path
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DeliveryId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/logs/deliveries_list_only/index.md b/website/docs/services/logs/deliveries_list_only/index.md
deleted file mode 100644
index 93259eb8d..000000000
--- a/website/docs/services/logs/deliveries_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: deliveries_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - deliveries_list_only
-  - logs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>deliveries</code> in a region or regions, for all properties use <a href="/services/logs/deliveries/"><code>deliveries</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>deliveries_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This structure contains information about one delivery in your account.<br />A delivery is a connection between a logical delivery source and a logical delivery destination.<br />For more information, see &#91;CreateDelivery&#93;(https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API&#95;CreateDelivery.html).</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.logs.deliveries_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "delivery_id",
-    "type": "string",
-    "description": "The unique ID that identifies this delivery in your account."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>deliveries</code> in a region.
-```sql
-SELECT
-region,
-delivery_id
-FROM awscc.logs.deliveries_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>deliveries_list_only</code> resource, see <a href="/services/logs/deliveries/#permissions"><code>deliveries</code></a>
-
diff --git a/website/docs/services/logs/delivery_destinations/index.md b/website/docs/services/logs/delivery_destinations/index.md
index 5fbb6cbb8..915315670 100644
--- a/website/docs/services/logs/delivery_destinations/index.md
+++ b/website/docs/services/logs/delivery_destinations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>delivery_destination</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets a <code>delivery_destination</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of this delivery destination."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-deliverydestination.html"><code>AWS::Logs::DeliveryDestination</code></a>.
 
@@ -103,31 +129,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>delivery_destinations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>delivery_destinations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>delivery_destinations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>delivery_destinations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>delivery_destinations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>delivery_destination</code>.
 ```sql
 SELECT
@@ -150,6 +191,19 @@ output_format
 FROM awscc.logs.delivery_destinations
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>delivery_destinations</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.logs.delivery_destinations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -230,6 +284,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.logs.delivery_destinations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "DeliveryDestinationPolicy": delivery_destination_policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/logs/delivery_destinations_list_only/index.md b/website/docs/services/logs/delivery_destinations_list_only/index.md
deleted file mode 100644
index b57c0b05a..000000000
--- a/website/docs/services/logs/delivery_destinations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: delivery_destinations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - delivery_destinations_list_only
-  - logs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>delivery_destinations</code> in a region or regions, for all properties use <a href="/services/logs/delivery_destinations/"><code>delivery_destinations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>delivery_destinations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This structure contains information about one delivery destination in your account.<br />A delivery destination is an AWS resource that represents an AWS service that logs can be sent to CloudWatch Logs, Amazon S3, are supported as Kinesis Data Firehose delivery destinations.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.logs.delivery_destinations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of this delivery destination."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>delivery_destinations</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.logs.delivery_destinations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>delivery_destinations_list_only</code> resource, see <a href="/services/logs/delivery_destinations/#permissions"><code>delivery_destinations</code></a>
-
diff --git a/website/docs/services/logs/delivery_sources/index.md b/website/docs/services/logs/delivery_sources/index.md
index b600cb250..ecd02ced7 100644
--- a/website/docs/services/logs/delivery_sources/index.md
+++ b/website/docs/services/logs/delivery_sources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>delivery_source</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>delivery_source</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The unique name of the Log source."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-deliverysource.html"><code>AWS::Logs::DeliverySource</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>delivery_sources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>delivery_sources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>delivery_sources</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>delivery_sources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>delivery_sources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>delivery_source</code>.
 ```sql
 SELECT
@@ -138,6 +179,19 @@ tags
 FROM awscc.logs.delivery_sources
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>delivery_sources</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.logs.delivery_sources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -212,6 +266,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.logs.delivery_sources
+SET data__PatchDocument = string('{{ {
+    "ResourceArn": resource_arn,
+    "LogType": log_type,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/logs/delivery_sources_list_only/index.md b/website/docs/services/logs/delivery_sources_list_only/index.md
deleted file mode 100644
index 43eb7a0be..000000000
--- a/website/docs/services/logs/delivery_sources_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: delivery_sources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - delivery_sources_list_only
-  - logs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>delivery_sources</code> in a region or regions, for all properties use <a href="/services/logs/delivery_sources/"><code>delivery_sources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>delivery_sources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A delivery source is an AWS resource that sends logs to an AWS destination. The destination can be CloudWatch Logs, Amazon S3, or Kinesis Data Firehose.<br />Only some AWS services support being configured as a delivery source. These services are listed as Supported &#91;V2 Permissions&#93; in the table at &#91;Enabling logging from AWS services&#93;(https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/AWS-logs-and-resource-policy.html).</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.logs.delivery_sources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The unique name of the Log source."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>delivery_sources</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.logs.delivery_sources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>delivery_sources_list_only</code> resource, see <a href="/services/logs/delivery_sources/#permissions"><code>delivery_sources</code></a>
-
diff --git a/website/docs/services/logs/destinations/index.md b/website/docs/services/logs/destinations/index.md
index c8b501e9b..cdef8464c 100644
--- a/website/docs/services/logs/destinations/index.md
+++ b/website/docs/services/logs/destinations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>destination</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>destination</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "destination_name",
+    "type": "string",
+    "description": "The name of the destination resource"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-destination.html"><code>AWS::Logs::Destination</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>destinations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DestinationName, TargetArn, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>destinations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>destinations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>destinations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>destinations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>destination</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ target_arn
 FROM awscc.logs.destinations
 WHERE region = 'us-east-1' AND data__Identifier = '<DestinationName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>destinations</code> in a region.
+```sql
+SELECT
+region,
+destination_name
+FROM awscc.logs.destinations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.logs.destinations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "DestinationPolicy": destination_policy,
+    "RoleArn": role_arn,
+    "TargetArn": target_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DestinationName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/logs/destinations_list_only/index.md b/website/docs/services/logs/destinations_list_only/index.md
deleted file mode 100644
index dbb74c09a..000000000
--- a/website/docs/services/logs/destinations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: destinations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - destinations_list_only
-  - logs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>destinations</code> in a region or regions, for all properties use <a href="/services/logs/destinations/"><code>destinations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>destinations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Logs::Destination resource specifies a CloudWatch Logs destination. A destination encapsulates a physical resource (such as an Amazon Kinesis data stream) and enables you to subscribe that resource to a stream of log events.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.logs.destinations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "destination_name",
-    "type": "string",
-    "description": "The name of the destination resource"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>destinations</code> in a region.
-```sql
-SELECT
-region,
-destination_name
-FROM awscc.logs.destinations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>destinations_list_only</code> resource, see <a href="/services/logs/destinations/#permissions"><code>destinations</code></a>
-
diff --git a/website/docs/services/logs/index.md b/website/docs/services/logs/index.md
index 0618cb917..b20a161db 100644
--- a/website/docs/services/logs/index.md
+++ b/website/docs/services/logs/index.md
@@ -20,7 +20,7 @@ The logs service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>26</b></span><br />
+<span>total resources:&nbsp;<b>13</b></span><br />
 </div>
 </div>
 
@@ -30,32 +30,19 @@ The logs service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/logs/account_policies/">account_policies</a><br />
-<a href="/services/logs/account_policies_list_only/">account_policies_list_only</a><br />
 <a href="/services/logs/deliveries/">deliveries</a><br />
-<a href="/services/logs/deliveries_list_only/">deliveries_list_only</a><br />
 <a href="/services/logs/delivery_destinations/">delivery_destinations</a><br />
-<a href="/services/logs/delivery_destinations_list_only/">delivery_destinations_list_only</a><br />
 <a href="/services/logs/delivery_sources/">delivery_sources</a><br />
-<a href="/services/logs/delivery_sources_list_only/">delivery_sources_list_only</a><br />
 <a href="/services/logs/destinations/">destinations</a><br />
-<a href="/services/logs/destinations_list_only/">destinations_list_only</a><br />
 <a href="/services/logs/integrations/">integrations</a><br />
-<a href="/services/logs/integrations_list_only/">integrations_list_only</a><br />
 <a href="/services/logs/log_anomaly_detectors/">log_anomaly_detectors</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/logs/log_anomaly_detectors_list_only/">log_anomaly_detectors_list_only</a><br />
 <a href="/services/logs/log_streams/">log_streams</a><br />
-<a href="/services/logs/log_streams_list_only/">log_streams_list_only</a><br />
 <a href="/services/logs/metric_filters/">metric_filters</a><br />
-<a href="/services/logs/metric_filters_list_only/">metric_filters_list_only</a><br />
 <a href="/services/logs/query_definitions/">query_definitions</a><br />
-<a href="/services/logs/query_definitions_list_only/">query_definitions_list_only</a><br />
 <a href="/services/logs/resource_policies/">resource_policies</a><br />
-<a href="/services/logs/resource_policies_list_only/">resource_policies_list_only</a><br />
 <a href="/services/logs/subscription_filters/">subscription_filters</a><br />
-<a href="/services/logs/subscription_filters_list_only/">subscription_filters_list_only</a><br />
-<a href="/services/logs/transformers/">transformers</a><br />
-<a href="/services/logs/transformers_list_only/">transformers_list_only</a>
+<a href="/services/logs/transformers/">transformers</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/logs/integrations/index.md b/website/docs/services/logs/integrations/index.md
index cab22f733..ba1f2cd74 100644
--- a/website/docs/services/logs/integrations/index.md
+++ b/website/docs/services/logs/integrations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>integration</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "integration_name",
@@ -84,6 +93,23 @@ Creates, updates, deletes or gets an <code>integration</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "integration_name",
+    "type": "string",
+    "description": "User provided identifier for integration, unique to the user account."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-integration.html"><code>AWS::Logs::Integration</code></a>.
 
@@ -93,26 +119,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IntegrationName, IntegrationType, ResourceConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>integrations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -121,6 +152,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>integration</code>.
 ```sql
 SELECT
@@ -132,6 +172,19 @@ integration_status
 FROM awscc.logs.integrations
 WHERE region = 'us-east-1' AND data__Identifier = '<IntegrationName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>integrations</code> in a region.
+```sql
+SELECT
+region,
+integration_name
+FROM awscc.logs.integrations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -211,6 +264,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/logs/integrations_list_only/index.md b/website/docs/services/logs/integrations_list_only/index.md
deleted file mode 100644
index 70061b3c9..000000000
--- a/website/docs/services/logs/integrations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: integrations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - integrations_list_only
-  - logs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>integrations</code> in a region or regions, for all properties use <a href="/services/logs/integrations/"><code>integrations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>integrations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema for Logs Integration Resource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.logs.integrations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "integration_name",
-    "type": "string",
-    "description": "User provided identifier for integration, unique to the user account."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>integrations</code> in a region.
-```sql
-SELECT
-region,
-integration_name
-FROM awscc.logs.integrations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>integrations_list_only</code> resource, see <a href="/services/logs/integrations/#permissions"><code>integrations</code></a>
-
diff --git a/website/docs/services/logs/log_anomaly_detectors/index.md b/website/docs/services/logs/log_anomaly_detectors/index.md
index 8ab004bdd..1ed0980e4 100644
--- a/website/docs/services/logs/log_anomaly_detectors/index.md
+++ b/website/docs/services/logs/log_anomaly_detectors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>log_anomaly_detector</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "account_id",
@@ -95,6 +104,23 @@ Creates, updates, deletes or gets a <code>log_anomaly_detector</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "anomaly_detector_arn",
+    "type": "string",
+    "description": "ARN of LogAnomalyDetector"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loganomalydetector.html"><code>AWS::Logs::LogAnomalyDetector</code></a>.
 
@@ -104,31 +130,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>log_anomaly_detectors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>log_anomaly_detectors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>log_anomaly_detectors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>log_anomaly_detectors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>log_anomaly_detectors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -137,6 +169,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>log_anomaly_detector</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ anomaly_detector_arn
 FROM awscc.logs.log_anomaly_detectors
 WHERE region = 'us-east-1' AND data__Identifier = '<AnomalyDetectorArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>log_anomaly_detectors</code> in a region.
+```sql
+SELECT
+region,
+anomaly_detector_arn
+FROM awscc.logs.log_anomaly_detectors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -240,6 +294,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.logs.log_anomaly_detectors
+SET data__PatchDocument = string('{{ {
+    "AccountId": account_id,
+    "KmsKeyId": kms_key_id,
+    "DetectorName": detector_name,
+    "LogGroupArnList": log_group_arn_list,
+    "EvaluationFrequency": evaluation_frequency,
+    "FilterPattern": filter_pattern,
+    "AnomalyVisibilityTime": anomaly_visibility_time
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AnomalyDetectorArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/logs/log_anomaly_detectors_list_only/index.md b/website/docs/services/logs/log_anomaly_detectors_list_only/index.md
deleted file mode 100644
index 4fe450d0a..000000000
--- a/website/docs/services/logs/log_anomaly_detectors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: log_anomaly_detectors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - log_anomaly_detectors_list_only
-  - logs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>log_anomaly_detectors</code> in a region or regions, for all properties use <a href="/services/logs/log_anomaly_detectors/"><code>log_anomaly_detectors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>log_anomaly_detectors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Logs::LogAnomalyDetector resource specifies a CloudWatch Logs LogAnomalyDetector.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.logs.log_anomaly_detectors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "anomaly_detector_arn",
-    "type": "string",
-    "description": "ARN of LogAnomalyDetector"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>log_anomaly_detectors</code> in a region.
-```sql
-SELECT
-region,
-anomaly_detector_arn
-FROM awscc.logs.log_anomaly_detectors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>log_anomaly_detectors_list_only</code> resource, see <a href="/services/logs/log_anomaly_detectors/#permissions"><code>log_anomaly_detectors</code></a>
-
diff --git a/website/docs/services/logs/log_streams/index.md b/website/docs/services/logs/log_streams/index.md
index 0d4ab071a..580e17941 100644
--- a/website/docs/services/logs/log_streams/index.md
+++ b/website/docs/services/logs/log_streams/index.md
@@ -33,6 +33,35 @@ Creates, updates, deletes or gets a <code>log_stream</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "log_stream_name",
+    "type": "string",
+    "description": "The name of the log stream. The name must be unique wihtin the log group."
+  },
+  {
+    "name": "log_group_name",
+    "type": "string",
+    "description": "The name of the log group where the log stream is created."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "log_stream_name",
@@ -50,6 +79,8 @@ Creates, updates, deletes or gets a <code>log_stream</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-logstream.html"><code>AWS::Logs::LogStream</code></a>.
 
@@ -59,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>log_streams</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LogGroupName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>log_streams</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>log_streams_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>log_streams</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>log_stream</code>.
 ```sql
 SELECT
@@ -96,6 +141,20 @@ log_group_name
 FROM awscc.logs.log_streams
 WHERE region = 'us-east-1' AND data__Identifier = '<LogGroupName>|<LogStreamName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>log_streams</code> in a region.
+```sql
+SELECT
+region,
+log_group_name,
+log_stream_name
+FROM awscc.logs.log_streams_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -160,6 +219,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/logs/log_streams_list_only/index.md b/website/docs/services/logs/log_streams_list_only/index.md
deleted file mode 100644
index ebc974370..000000000
--- a/website/docs/services/logs/log_streams_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: log_streams_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - log_streams_list_only
-  - logs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>log_streams</code> in a region or regions, for all properties use <a href="/services/logs/log_streams/"><code>log_streams</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>log_streams_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Logs::LogStream</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.logs.log_streams_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "log_stream_name",
-    "type": "string",
-    "description": "The name of the log stream. The name must be unique wihtin the log group."
-  },
-  {
-    "name": "log_group_name",
-    "type": "string",
-    "description": "The name of the log group where the log stream is created."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>log_streams</code> in a region.
-```sql
-SELECT
-region,
-log_group_name,
-log_stream_name
-FROM awscc.logs.log_streams_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>log_streams_list_only</code> resource, see <a href="/services/logs/log_streams/#permissions"><code>log_streams</code></a>
-
diff --git a/website/docs/services/logs/metric_filters/index.md b/website/docs/services/logs/metric_filters/index.md
index c7b9483f4..b2f085c7b 100644
--- a/website/docs/services/logs/metric_filters/index.md
+++ b/website/docs/services/logs/metric_filters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>metric_filter</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "metric_transformations",
@@ -109,6 +118,28 @@ Creates, updates, deletes or gets a <code>metric_filter</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "log_group_name",
+    "type": "string",
+    "description": "The name of an existing log group that you want to associate with this metric filter."
+  },
+  {
+    "name": "filter_name",
+    "type": "string",
+    "description": "The name of the metric filter."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-metricfilter.html"><code>AWS::Logs::MetricFilter</code></a>.
 
@@ -118,31 +149,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>metric_filters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FilterPattern, LogGroupName, MetricTransformations, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>metric_filters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>metric_filters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>metric_filters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>metric_filters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +188,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>metric_filter</code>.
 ```sql
 SELECT
@@ -163,6 +209,20 @@ filter_name
 FROM awscc.logs.metric_filters
 WHERE region = 'us-east-1' AND data__Identifier = '<LogGroupName>|<FilterName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>metric_filters</code> in a region.
+```sql
+SELECT
+region,
+log_group_name,
+filter_name
+FROM awscc.logs.metric_filters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -251,6 +311,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.logs.metric_filters
+SET data__PatchDocument = string('{{ {
+    "MetricTransformations": metric_transformations,
+    "FilterPattern": filter_pattern,
+    "ApplyOnTransformedLogs": apply_on_transformed_logs
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LogGroupName>|<FilterName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/logs/metric_filters_list_only/index.md b/website/docs/services/logs/metric_filters_list_only/index.md
deleted file mode 100644
index 3e15a09b8..000000000
--- a/website/docs/services/logs/metric_filters_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: metric_filters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - metric_filters_list_only
-  - logs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>metric_filters</code> in a region or regions, for all properties use <a href="/services/logs/metric_filters/"><code>metric_filters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>metric_filters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::Logs::MetricFilter&#96;&#96; resource specifies a metric filter that describes how CWL extracts information from logs and transforms it into Amazon CloudWatch metrics. If you have multiple metric filters that are associated with a log group, all the filters are applied to the log streams in that group.<br />The maximum number of metric filters that can be associated with a log group is 100.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.logs.metric_filters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "log_group_name",
-    "type": "string",
-    "description": "The name of an existing log group that you want to associate with this metric filter."
-  },
-  {
-    "name": "filter_name",
-    "type": "string",
-    "description": "The name of the metric filter."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>metric_filters</code> in a region.
-```sql
-SELECT
-region,
-log_group_name,
-filter_name
-FROM awscc.logs.metric_filters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>metric_filters_list_only</code> resource, see <a href="/services/logs/metric_filters/#permissions"><code>metric_filters</code></a>
-
diff --git a/website/docs/services/logs/query_definitions/index.md b/website/docs/services/logs/query_definitions/index.md
index 9daf600d4..dc1907c37 100644
--- a/website/docs/services/logs/query_definitions/index.md
+++ b/website/docs/services/logs/query_definitions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>query_definition</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -65,6 +74,23 @@ Creates, updates, deletes or gets a <code>query_definition</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "query_definition_id",
+    "type": "string",
+    "description": "Unique identifier of a query definition"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-querydefinition.html"><code>AWS::Logs::QueryDefinition</code></a>.
 
@@ -74,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>query_definitions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, QueryString, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>query_definitions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>query_definitions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>query_definitions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>query_definitions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>query_definition</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ query_language
 FROM awscc.logs.query_definitions
 WHERE region = 'us-east-1' AND data__Identifier = '<QueryDefinitionId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>query_definitions</code> in a region.
+```sql
+SELECT
+region,
+query_definition_id
+FROM awscc.logs.query_definitions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -194,6 +248,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.logs.query_definitions
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "QueryString": query_string,
+    "LogGroupNames": log_group_names,
+    "QueryLanguage": query_language
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<QueryDefinitionId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/logs/query_definitions_list_only/index.md b/website/docs/services/logs/query_definitions_list_only/index.md
deleted file mode 100644
index 031c50066..000000000
--- a/website/docs/services/logs/query_definitions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: query_definitions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - query_definitions_list_only
-  - logs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>query_definitions</code> in a region or regions, for all properties use <a href="/services/logs/query_definitions/"><code>query_definitions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>query_definitions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The resource schema for AWSLogs QueryDefinition</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.logs.query_definitions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "query_definition_id",
-    "type": "string",
-    "description": "Unique identifier of a query definition"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>query_definitions</code> in a region.
-```sql
-SELECT
-region,
-query_definition_id
-FROM awscc.logs.query_definitions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>query_definitions_list_only</code> resource, see <a href="/services/logs/query_definitions/#permissions"><code>query_definitions</code></a>
-
diff --git a/website/docs/services/logs/resource_policies/index.md b/website/docs/services/logs/resource_policies/index.md
index 8f55e7091..3ba78bec7 100644
--- a/website/docs/services/logs/resource_policies/index.md
+++ b/website/docs/services/logs/resource_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_policy</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "policy_name",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>resource_policy</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "policy_name",
+    "type": "string",
+    "description": "A name for resource policy"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-resourcepolicy.html"><code>AWS::Logs::ResourcePolicy</code></a>.
 
@@ -59,31 +85,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PolicyName, PolicyDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +124,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_policy</code>.
 ```sql
 SELECT
@@ -101,6 +142,19 @@ policy_document
 FROM awscc.logs.resource_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<PolicyName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_policies</code> in a region.
+```sql
+SELECT
+region,
+policy_name
+FROM awscc.logs.resource_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -167,6 +221,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.logs.resource_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyDocument": policy_document
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PolicyName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/logs/resource_policies_list_only/index.md b/website/docs/services/logs/resource_policies_list_only/index.md
deleted file mode 100644
index 9c28c3e11..000000000
--- a/website/docs/services/logs/resource_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_policies_list_only
-  - logs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_policies</code> in a region or regions, for all properties use <a href="/services/logs/resource_policies/"><code>resource_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The resource schema for AWSLogs ResourcePolicy</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.logs.resource_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "policy_name",
-    "type": "string",
-    "description": "A name for resource policy"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_policies</code> in a region.
-```sql
-SELECT
-region,
-policy_name
-FROM awscc.logs.resource_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_policies_list_only</code> resource, see <a href="/services/logs/resource_policies/#permissions"><code>resource_policies</code></a>
-
diff --git a/website/docs/services/logs/subscription_filters/index.md b/website/docs/services/logs/subscription_filters/index.md
index c53a6fcbd..aa1f432c3 100644
--- a/website/docs/services/logs/subscription_filters/index.md
+++ b/website/docs/services/logs/subscription_filters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>subscription_filter</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "filter_name",
@@ -75,6 +84,28 @@ Creates, updates, deletes or gets a <code>subscription_filter</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "filter_name",
+    "type": "string",
+    "description": "The name of the subscription filter."
+  },
+  {
+    "name": "log_group_name",
+    "type": "string",
+    "description": "The log group to associate with the subscription filter. All log events that are uploaded to this log group are filtered and delivered to the specified AWS resource if the filter pattern matches the log events."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html"><code>AWS::Logs::SubscriptionFilter</code></a>.
 
@@ -84,31 +115,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>subscription_filters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DestinationArn, FilterPattern, LogGroupName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>subscription_filters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>subscription_filters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>subscription_filters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>subscription_filters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +154,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>subscription_filter</code>.
 ```sql
 SELECT
@@ -131,6 +177,20 @@ apply_on_transformed_logs
 FROM awscc.logs.subscription_filters
 WHERE region = 'us-east-1' AND data__Identifier = '<FilterName>|<LogGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>subscription_filters</code> in a region.
+```sql
+SELECT
+region,
+filter_name,
+log_group_name
+FROM awscc.logs.subscription_filters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +279,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.logs.subscription_filters
+SET data__PatchDocument = string('{{ {
+    "DestinationArn": destination_arn,
+    "FilterPattern": filter_pattern,
+    "RoleArn": role_arn,
+    "Distribution": distribution,
+    "ApplyOnTransformedLogs": apply_on_transformed_logs
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FilterName>|<LogGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/logs/subscription_filters_list_only/index.md b/website/docs/services/logs/subscription_filters_list_only/index.md
deleted file mode 100644
index aef834cd8..000000000
--- a/website/docs/services/logs/subscription_filters_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: subscription_filters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - subscription_filters_list_only
-  - logs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>subscription_filters</code> in a region or regions, for all properties use <a href="/services/logs/subscription_filters/"><code>subscription_filters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>subscription_filters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::Logs::SubscriptionFilter&#96;&#96; resource specifies a subscription filter and associates it with the specified log group. Subscription filters allow you to subscribe to a real-time stream of log events and have them delivered to a specific destination. Currently, the supported destinations are:<br />+ An Amazon Kinesis data stream belonging to the same account as the subscription filter, for same-account delivery.<br />+ A logical destination that belongs to a different account, for cross-account delivery.<br />+ An Amazon Kinesis Firehose delivery stream that belongs to the same account as the subscription filter, for same-account delivery.<br />+ An LAMlong function that belongs to the same account as the subscription filter, for same-account delivery.<br /><br />There can be as many as two subscription filters associated with a log group.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.logs.subscription_filters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "filter_name",
-    "type": "string",
-    "description": "The name of the subscription filter."
-  },
-  {
-    "name": "log_group_name",
-    "type": "string",
-    "description": "The log group to associate with the subscription filter. All log events that are uploaded to this log group are filtered and delivered to the specified AWS resource if the filter pattern matches the log events."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>subscription_filters</code> in a region.
-```sql
-SELECT
-region,
-filter_name,
-log_group_name
-FROM awscc.logs.subscription_filters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>subscription_filters_list_only</code> resource, see <a href="/services/logs/subscription_filters/#permissions"><code>subscription_filters</code></a>
-
diff --git a/website/docs/services/logs/transformers/index.md b/website/docs/services/logs/transformers/index.md
index e795594ab..bfa34b9f4 100644
--- a/website/docs/services/logs/transformers/index.md
+++ b/website/docs/services/logs/transformers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transformer</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "log_group_identifier",
@@ -517,6 +526,23 @@ Creates, updates, deletes or gets a <code>transformer</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "log_group_identifier",
+    "type": "string",
+    "description": "Existing log group that you want to associate with this transformer."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-transformer.html"><code>AWS::Logs::Transformer</code></a>.
 
@@ -526,31 +552,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transformers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LogGroupIdentifier, TransformerConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transformers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>transformers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transformers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transformers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -559,6 +591,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transformer</code>.
 ```sql
 SELECT
@@ -568,6 +609,19 @@ transformer_config
 FROM awscc.logs.transformers
 WHERE region = 'us-east-1' AND data__Identifier = '<LogGroupIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transformers</code> in a region.
+```sql
+SELECT
+region,
+log_group_identifier
+FROM awscc.logs.transformers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -729,6 +783,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.logs.transformers
+SET data__PatchDocument = string('{{ {
+    "TransformerConfig": transformer_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LogGroupIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/logs/transformers_list_only/index.md b/website/docs/services/logs/transformers_list_only/index.md
deleted file mode 100644
index ee4b2e9ee..000000000
--- a/website/docs/services/logs/transformers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: transformers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transformers_list_only
-  - logs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transformers</code> in a region or regions, for all properties use <a href="/services/logs/transformers/"><code>transformers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transformers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Specifies a transformer on the log group to transform logs into consistent structured and information rich format.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.logs.transformers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "log_group_identifier",
-    "type": "string",
-    "description": "Existing log group that you want to associate with this transformer."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transformers</code> in a region.
-```sql
-SELECT
-region,
-log_group_identifier
-FROM awscc.logs.transformers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transformers_list_only</code> resource, see <a href="/services/logs/transformers/#permissions"><code>transformers</code></a>
-
diff --git a/website/docs/services/lookoutequipment/index.md b/website/docs/services/lookoutequipment/index.md
index 2534fe7af..bb30a2004 100644
--- a/website/docs/services/lookoutequipment/index.md
+++ b/website/docs/services/lookoutequipment/index.md
@@ -20,7 +20,7 @@ The lookoutequipment service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The lookoutequipment service documentation.
 <a href="/services/lookoutequipment/inference_schedulers/">inference_schedulers</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/lookoutequipment/inference_schedulers_list_only/">inference_schedulers_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/lookoutequipment/inference_schedulers/index.md b/website/docs/services/lookoutequipment/inference_schedulers/index.md
index b615db8fc..7af888173 100644
--- a/website/docs/services/lookoutequipment/inference_schedulers/index.md
+++ b/website/docs/services/lookoutequipment/inference_schedulers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>inference_scheduler</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "data_delay_offset_in_minutes",
@@ -167,6 +176,23 @@ Creates, updates, deletes or gets an <code>inference_scheduler</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "inference_scheduler_name",
+    "type": "string",
+    "description": "The name of the inference scheduler being created."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutequipment-inferencescheduler.html"><code>AWS::LookoutEquipment::InferenceScheduler</code></a>.
 
@@ -176,31 +202,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>inference_schedulers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DataInputConfiguration, DataOutputConfiguration, DataUploadFrequency, ModelName, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>inference_schedulers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>inference_schedulers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>inference_schedulers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>inference_schedulers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -209,6 +241,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>inference_scheduler</code>.
 ```sql
 SELECT
@@ -226,6 +267,19 @@ inference_scheduler_arn
 FROM awscc.lookoutequipment.inference_schedulers
 WHERE region = 'us-east-1' AND data__Identifier = '<InferenceSchedulerName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>inference_schedulers</code> in a region.
+```sql
+SELECT
+region,
+inference_scheduler_name
+FROM awscc.lookoutequipment.inference_schedulers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -339,6 +393,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.lookoutequipment.inference_schedulers
+SET data__PatchDocument = string('{{ {
+    "DataDelayOffsetInMinutes": data_delay_offset_in_minutes,
+    "DataInputConfiguration": data_input_configuration,
+    "DataOutputConfiguration": data_output_configuration,
+    "DataUploadFrequency": data_upload_frequency,
+    "RoleArn": role_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InferenceSchedulerName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lookoutequipment/inference_schedulers_list_only/index.md b/website/docs/services/lookoutequipment/inference_schedulers_list_only/index.md
deleted file mode 100644
index 7a4d3f875..000000000
--- a/website/docs/services/lookoutequipment/inference_schedulers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: inference_schedulers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - inference_schedulers_list_only
-  - lookoutequipment
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>inference_schedulers</code> in a region or regions, for all properties use <a href="/services/lookoutequipment/inference_schedulers/"><code>inference_schedulers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>inference_schedulers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for LookoutEquipment InferenceScheduler.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lookoutequipment.inference_schedulers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "inference_scheduler_name",
-    "type": "string",
-    "description": "The name of the inference scheduler being created."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>inference_schedulers</code> in a region.
-```sql
-SELECT
-region,
-inference_scheduler_name
-FROM awscc.lookoutequipment.inference_schedulers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>inference_schedulers_list_only</code> resource, see <a href="/services/lookoutequipment/inference_schedulers/#permissions"><code>inference_schedulers</code></a>
-
diff --git a/website/docs/services/lookoutvision/index.md b/website/docs/services/lookoutvision/index.md
index 061fb441c..2776287b9 100644
--- a/website/docs/services/lookoutvision/index.md
+++ b/website/docs/services/lookoutvision/index.md
@@ -20,7 +20,7 @@ The lookoutvision service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The lookoutvision service documentation.
 <a href="/services/lookoutvision/projects/">projects</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/lookoutvision/projects_list_only/">projects_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/lookoutvision/projects/index.md b/website/docs/services/lookoutvision/projects/index.md
index a441020a1..dea201ff5 100644
--- a/website/docs/services/lookoutvision/projects/index.md
+++ b/website/docs/services/lookoutvision/projects/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>project</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>project</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "project_name",
+    "type": "string",
+    "description": "The name of the Amazon Lookout for Vision project"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutvision-project.html"><code>AWS::LookoutVision::Project</code></a>.
 
@@ -59,26 +85,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ProjectName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>projects_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +118,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>project</code>.
 ```sql
 SELECT
@@ -96,6 +136,19 @@ project_name
 FROM awscc.lookoutvision.projects
 WHERE region = 'us-east-1' AND data__Identifier = '<ProjectName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>projects</code> in a region.
+```sql
+SELECT
+region,
+project_name
+FROM awscc.lookoutvision.projects_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -156,6 +209,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/lookoutvision/projects_list_only/index.md b/website/docs/services/lookoutvision/projects_list_only/index.md
deleted file mode 100644
index 15c583f5b..000000000
--- a/website/docs/services/lookoutvision/projects_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: projects_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - projects_list_only
-  - lookoutvision
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>projects</code> in a region or regions, for all properties use <a href="/services/lookoutvision/projects/"><code>projects</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>projects_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::LookoutVision::Project type creates an Amazon Lookout for Vision project. A project is a grouping of the resources needed to create and manage a Lookout for Vision model.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lookoutvision.projects_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "project_name",
-    "type": "string",
-    "description": "The name of the Amazon Lookout for Vision project"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>projects</code> in a region.
-```sql
-SELECT
-region,
-project_name
-FROM awscc.lookoutvision.projects_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>projects_list_only</code> resource, see <a href="/services/lookoutvision/projects/#permissions"><code>projects</code></a>
-
diff --git a/website/docs/services/m2/applications/index.md b/website/docs/services/m2/applications/index.md
index 5dd37e41e..91c26bf52 100644
--- a/website/docs/services/m2/applications/index.md
+++ b/website/docs/services/m2/applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "application_arn",
@@ -85,6 +94,23 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-m2-application.html"><code>AWS::M2::Application</code></a>.
 
@@ -94,31 +120,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EngineType, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -127,6 +159,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.m2.applications
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>applications</code> in a region.
+```sql
+SELECT
+region,
+application_arn
+FROM awscc.m2.applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -229,6 +283,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.m2.applications
+SET data__PatchDocument = string('{{ {
+    "Definition": definition,
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/m2/applications_list_only/index.md b/website/docs/services/m2/applications_list_only/index.md
deleted file mode 100644
index aef28d52e..000000000
--- a/website/docs/services/m2/applications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - applications_list_only
-  - m2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>applications</code> in a region or regions, for all properties use <a href="/services/m2/applications/"><code>applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents an application that runs on an AWS Mainframe Modernization Environment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.m2.applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>applications</code> in a region.
-```sql
-SELECT
-region,
-application_arn
-FROM awscc.m2.applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>applications_list_only</code> resource, see <a href="/services/m2/applications/#permissions"><code>applications</code></a>
-
diff --git a/website/docs/services/m2/deployments/index.md b/website/docs/services/m2/deployments/index.md
index 6cdc592b8..deed625cd 100644
--- a/website/docs/services/m2/deployments/index.md
+++ b/website/docs/services/m2/deployments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "environment_id",
@@ -65,6 +74,23 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_id",
+    "type": "string",
+    "description": "The application ID."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-m2-deployment.html"><code>AWS::M2::Deployment</code></a>.
 
@@ -74,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EnvironmentId, ApplicationId, ApplicationVersion, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>deployments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>deployments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>deployment</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ status
 FROM awscc.m2.deployments
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>deployments</code> in a region.
+```sql
+SELECT
+region,
+application_id
+FROM awscc.m2.deployments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -191,6 +245,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.m2.deployments
+SET data__PatchDocument = string('{{ {
+    "ApplicationVersion": application_version
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/m2/deployments_list_only/index.md b/website/docs/services/m2/deployments_list_only/index.md
deleted file mode 100644
index 0bbb4d4a9..000000000
--- a/website/docs/services/m2/deployments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: deployments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - deployments_list_only
-  - m2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>deployments</code> in a region or regions, for all properties use <a href="/services/m2/deployments/"><code>deployments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>deployments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a deployment resource of an AWS Mainframe Modernization (M2) application to a specified environment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.m2.deployments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_id",
-    "type": "string",
-    "description": "The application ID."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>deployments</code> in a region.
-```sql
-SELECT
-region,
-application_id
-FROM awscc.m2.deployments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>deployments_list_only</code> resource, see <a href="/services/m2/deployments/#permissions"><code>deployments</code></a>
-
diff --git a/website/docs/services/m2/environments/index.md b/website/docs/services/m2/environments/index.md
index d8e01e38f..4b55b9c32 100644
--- a/website/docs/services/m2/environments/index.md
+++ b/website/docs/services/m2/environments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -127,6 +136,23 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "environment_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the runtime environment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-m2-environment.html"><code>AWS::M2::Environment</code></a>.
 
@@ -136,31 +162,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EngineType, InstanceType, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>environments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -169,6 +201,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>environment</code>.
 ```sql
 SELECT
@@ -192,6 +233,19 @@ tags
 FROM awscc.m2.environments
 WHERE region = 'us-east-1' AND data__Identifier = '<EnvironmentArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>environments</code> in a region.
+```sql
+SELECT
+region,
+environment_arn
+FROM awscc.m2.environments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -312,6 +366,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.m2.environments
+SET data__PatchDocument = string('{{ {
+    "EngineVersion": engine_version,
+    "HighAvailabilityConfig": high_availability_config,
+    "InstanceType": instance_type,
+    "PreferredMaintenanceWindow": preferred_maintenance_window,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<EnvironmentArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/m2/environments_list_only/index.md b/website/docs/services/m2/environments_list_only/index.md
deleted file mode 100644
index e35019526..000000000
--- a/website/docs/services/m2/environments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: environments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - environments_list_only
-  - m2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>environments</code> in a region or regions, for all properties use <a href="/services/m2/environments/"><code>environments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>environments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a runtime environment that can run migrated mainframe applications.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.m2.environments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "environment_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the runtime environment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>environments</code> in a region.
-```sql
-SELECT
-region,
-environment_arn
-FROM awscc.m2.environments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>environments_list_only</code> resource, see <a href="/services/m2/environments/#permissions"><code>environments</code></a>
-
diff --git a/website/docs/services/m2/index.md b/website/docs/services/m2/index.md
index 092110bc7..0d146db0e 100644
--- a/website/docs/services/m2/index.md
+++ b/website/docs/services/m2/index.md
@@ -20,7 +20,7 @@ The m2 service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The m2 service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/m2/applications/">applications</a><br />
-<a href="/services/m2/applications_list_only/">applications_list_only</a><br />
 <a href="/services/m2/deployments/">deployments</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/m2/deployments_list_only/">deployments_list_only</a><br />
-<a href="/services/m2/environments/">environments</a><br />
-<a href="/services/m2/environments_list_only/">environments_list_only</a>
+<a href="/services/m2/environments/">environments</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/macie/allow_lists/index.md b/website/docs/services/macie/allow_lists/index.md
index 12933a83b..5a5d15088 100644
--- a/website/docs/services/macie/allow_lists/index.md
+++ b/website/docs/services/macie/allow_lists/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>allow_list</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets an <code>allow_list</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "AllowList ID."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-allowlist.html"><code>AWS::Macie::AllowList</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>allow_lists</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Criteria, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>allow_lists</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>allow_lists</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>allow_lists_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>allow_lists</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>allow_list</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.macie.allow_lists
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>allow_lists</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.macie.allow_lists_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.macie.allow_lists
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "Criteria": criteria,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/macie/allow_lists_list_only/index.md b/website/docs/services/macie/allow_lists_list_only/index.md
deleted file mode 100644
index f8183b7e6..000000000
--- a/website/docs/services/macie/allow_lists_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: allow_lists_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - allow_lists_list_only
-  - macie
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>allow_lists</code> in a region or regions, for all properties use <a href="/services/macie/allow_lists/"><code>allow_lists</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>allow_lists_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Macie AllowList resource schema</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.macie.allow_lists_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "AllowList ID."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>allow_lists</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.macie.allow_lists_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>allow_lists_list_only</code> resource, see <a href="/services/macie/allow_lists/#permissions"><code>allow_lists</code></a>
-
diff --git a/website/docs/services/macie/custom_data_identifiers/index.md b/website/docs/services/macie/custom_data_identifiers/index.md
index f445e7453..2746a4701 100644
--- a/website/docs/services/macie/custom_data_identifiers/index.md
+++ b/website/docs/services/macie/custom_data_identifiers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>custom_data_identifier</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>custom_data_identifier</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Custom data identifier ID."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-customdataidentifier.html"><code>AWS::Macie::CustomDataIdentifier</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>custom_data_identifiers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Regex, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>custom_data_identifiers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>custom_data_identifiers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>custom_data_identifiers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>custom_data_identifiers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>custom_data_identifier</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ tags
 FROM awscc.macie.custom_data_identifiers
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>custom_data_identifiers</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.macie.custom_data_identifiers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -245,6 +299,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.macie.custom_data_identifiers
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/macie/custom_data_identifiers_list_only/index.md b/website/docs/services/macie/custom_data_identifiers_list_only/index.md
deleted file mode 100644
index d4708be84..000000000
--- a/website/docs/services/macie/custom_data_identifiers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: custom_data_identifiers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - custom_data_identifiers_list_only
-  - macie
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>custom_data_identifiers</code> in a region or regions, for all properties use <a href="/services/macie/custom_data_identifiers/"><code>custom_data_identifiers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>custom_data_identifiers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Macie CustomDataIdentifier resource schema</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.macie.custom_data_identifiers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Custom data identifier ID."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>custom_data_identifiers</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.macie.custom_data_identifiers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>custom_data_identifiers_list_only</code> resource, see <a href="/services/macie/custom_data_identifiers/#permissions"><code>custom_data_identifiers</code></a>
-
diff --git a/website/docs/services/macie/findings_filters/index.md b/website/docs/services/macie/findings_filters/index.md
index 51f206241..92ef506ea 100644
--- a/website/docs/services/macie/findings_filters/index.md
+++ b/website/docs/services/macie/findings_filters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>findings_filter</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -99,6 +108,23 @@ Creates, updates, deletes or gets a <code>findings_filter</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Findings filter ID."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-findingsfilter.html"><code>AWS::Macie::FindingsFilter</code></a>.
 
@@ -108,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>findings_filters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, FindingCriteria, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>findings_filters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>findings_filters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>findings_filters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>findings_filters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>findings_filter</code>.
 ```sql
 SELECT
@@ -156,6 +197,19 @@ tags
 FROM awscc.macie.findings_filters
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>findings_filters</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.macie.findings_filters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -241,6 +295,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.macie.findings_filters
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "FindingCriteria": finding_criteria,
+    "Action": action,
+    "Position": position,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/macie/findings_filters_list_only/index.md b/website/docs/services/macie/findings_filters_list_only/index.md
deleted file mode 100644
index 55759d441..000000000
--- a/website/docs/services/macie/findings_filters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: findings_filters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - findings_filters_list_only
-  - macie
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>findings_filters</code> in a region or regions, for all properties use <a href="/services/macie/findings_filters/"><code>findings_filters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>findings_filters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Macie FindingsFilter resource schema.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.macie.findings_filters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Findings filter ID."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>findings_filters</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.macie.findings_filters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>findings_filters_list_only</code> resource, see <a href="/services/macie/findings_filters/#permissions"><code>findings_filters</code></a>
-
diff --git a/website/docs/services/macie/index.md b/website/docs/services/macie/index.md
index a7fc9a670..a72d9068d 100644
--- a/website/docs/services/macie/index.md
+++ b/website/docs/services/macie/index.md
@@ -20,7 +20,7 @@ The macie service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The macie service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/macie/allow_lists/">allow_lists</a><br />
-<a href="/services/macie/allow_lists_list_only/">allow_lists_list_only</a><br />
-<a href="/services/macie/custom_data_identifiers/">custom_data_identifiers</a><br />
-<a href="/services/macie/custom_data_identifiers_list_only/">custom_data_identifiers_list_only</a>
+<a href="/services/macie/custom_data_identifiers/">custom_data_identifiers</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/macie/findings_filters/">findings_filters</a><br />
-<a href="/services/macie/findings_filters_list_only/">findings_filters_list_only</a><br />
-<a href="/services/macie/sessions/">sessions</a><br />
-<a href="/services/macie/sessions_list_only/">sessions_list_only</a>
+<a href="/services/macie/sessions/">sessions</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/macie/sessions/index.md b/website/docs/services/macie/sessions/index.md
index 9d88b8480..4ed71205d 100644
--- a/website/docs/services/macie/sessions/index.md
+++ b/website/docs/services/macie/sessions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>session</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "aws_account_id",
@@ -65,6 +74,23 @@ Creates, updates, deletes or gets a <code>session</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "aws_account_id",
+    "type": "string",
+    "description": "AWS account ID of customer"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-session.html"><code>AWS::Macie::Session</code></a>.
 
@@ -74,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>sessions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>sessions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>sessions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>sessions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>sessions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>session</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ automated_discovery_status
 FROM awscc.macie.sessions
 WHERE region = 'us-east-1' AND data__Identifier = '<AwsAccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>sessions</code> in a region.
+```sql
+SELECT
+region,
+aws_account_id
+FROM awscc.macie.sessions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -185,6 +239,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.macie.sessions
+SET data__PatchDocument = string('{{ {
+    "Status": status,
+    "FindingPublishingFrequency": finding_publishing_frequency
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AwsAccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/macie/sessions_list_only/index.md b/website/docs/services/macie/sessions_list_only/index.md
deleted file mode 100644
index 09d8b46a3..000000000
--- a/website/docs/services/macie/sessions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: sessions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - sessions_list_only
-  - macie
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>sessions</code> in a region or regions, for all properties use <a href="/services/macie/sessions/"><code>sessions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>sessions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Macie::Session resource specifies a new Amazon Macie session. A session is an object that represents the Amazon Macie service. A session is required for Amazon Macie to become operational.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.macie.sessions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "aws_account_id",
-    "type": "string",
-    "description": "AWS account ID of customer"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>sessions</code> in a region.
-```sql
-SELECT
-region,
-aws_account_id
-FROM awscc.macie.sessions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>sessions_list_only</code> resource, see <a href="/services/macie/sessions/#permissions"><code>sessions</code></a>
-
diff --git a/website/docs/services/managedblockchain/accessors/index.md b/website/docs/services/managedblockchain/accessors/index.md
index 2f78a7001..8613da3b6 100644
--- a/website/docs/services/managedblockchain/accessors/index.md
+++ b/website/docs/services/managedblockchain/accessors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>accessor</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets an <code>accessor</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-managedblockchain-accessor.html"><code>AWS::ManagedBlockchain::Accessor</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>accessors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AccessorType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>accessors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>accessors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>accessors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>accessors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>accessor</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.managedblockchain.accessors
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>accessors</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.managedblockchain.accessors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.managedblockchain.accessors
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/managedblockchain/accessors_list_only/index.md b/website/docs/services/managedblockchain/accessors_list_only/index.md
deleted file mode 100644
index 64ebdbabe..000000000
--- a/website/docs/services/managedblockchain/accessors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: accessors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - accessors_list_only
-  - managedblockchain
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>accessors</code> in a region or regions, for all properties use <a href="/services/managedblockchain/accessors/"><code>accessors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>accessors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::ManagedBlockchain::com.amazonaws.taiga.webservice.api#Accessor Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.managedblockchain.accessors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>accessors</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.managedblockchain.accessors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>accessors_list_only</code> resource, see <a href="/services/managedblockchain/accessors/#permissions"><code>accessors</code></a>
-
diff --git a/website/docs/services/managedblockchain/index.md b/website/docs/services/managedblockchain/index.md
index e1d79694b..7abe53e7e 100644
--- a/website/docs/services/managedblockchain/index.md
+++ b/website/docs/services/managedblockchain/index.md
@@ -20,7 +20,7 @@ The managedblockchain service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The managedblockchain service documentation.
 <a href="/services/managedblockchain/accessors/">accessors</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/managedblockchain/accessors_list_only/">accessors_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/mediaconnect/bridge_outputs/index.md b/website/docs/services/mediaconnect/bridge_outputs/index.md
index 4b90a365b..52528a486 100644
--- a/website/docs/services/mediaconnect/bridge_outputs/index.md
+++ b/website/docs/services/mediaconnect/bridge_outputs/index.md
@@ -206,6 +206,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediaconnect.bridge_outputs
+SET data__PatchDocument = string('{{ {
+    "NetworkOutput": network_output
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<BridgeArn>|<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediaconnect/bridge_sources/index.md b/website/docs/services/mediaconnect/bridge_sources/index.md
index 2965e4a55..2bae6f0e1 100644
--- a/website/docs/services/mediaconnect/bridge_sources/index.md
+++ b/website/docs/services/mediaconnect/bridge_sources/index.md
@@ -244,6 +244,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediaconnect.bridge_sources
+SET data__PatchDocument = string('{{ {
+    "FlowSource": flow_source,
+    "NetworkSource": network_source
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<BridgeArn>|<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediaconnect/bridges/index.md b/website/docs/services/mediaconnect/bridges/index.md
index 6188c4bdc..b6871dc95 100644
--- a/website/docs/services/mediaconnect/bridges/index.md
+++ b/website/docs/services/mediaconnect/bridges/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>bridge</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -252,6 +261,23 @@ Creates, updates, deletes or gets a <code>bridge</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "bridge_arn",
+    "type": "string",
+    "description": "The Amazon Resource Number (ARN) of the bridge."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-bridge.html"><code>AWS::MediaConnect::Bridge</code></a>.
 
@@ -261,31 +287,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>bridges</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, PlacementArn, Sources, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>bridges</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>bridges</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>bridges_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>bridges</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -294,6 +326,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>bridge</code>.
 ```sql
 SELECT
@@ -310,6 +351,19 @@ egress_gateway_bridge
 FROM awscc.mediaconnect.bridges
 WHERE region = 'us-east-1' AND data__Identifier = '<BridgeArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>bridges</code> in a region.
+```sql
+SELECT
+region,
+bridge_arn
+FROM awscc.mediaconnect.bridges_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -427,6 +481,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediaconnect.bridges
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "PlacementArn": placement_arn,
+    "SourceFailoverConfig": source_failover_config,
+    "Outputs": outputs,
+    "Sources": sources,
+    "IngressGatewayBridge": ingress_gateway_bridge,
+    "EgressGatewayBridge": egress_gateway_bridge
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<BridgeArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediaconnect/bridges_list_only/index.md b/website/docs/services/mediaconnect/bridges_list_only/index.md
deleted file mode 100644
index 4018d663f..000000000
--- a/website/docs/services/mediaconnect/bridges_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: bridges_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - bridges_list_only
-  - mediaconnect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>bridges</code> in a region or regions, for all properties use <a href="/services/mediaconnect/bridges/"><code>bridges</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>bridges_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaConnect::Bridge</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediaconnect.bridges_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "bridge_arn",
-    "type": "string",
-    "description": "The Amazon Resource Number (ARN) of the bridge."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>bridges</code> in a region.
-```sql
-SELECT
-region,
-bridge_arn
-FROM awscc.mediaconnect.bridges_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>bridges_list_only</code> resource, see <a href="/services/mediaconnect/bridges/#permissions"><code>bridges</code></a>
-
diff --git a/website/docs/services/mediaconnect/flow_entitlements/index.md b/website/docs/services/mediaconnect/flow_entitlements/index.md
index 47601c9c1..157eb0ef5 100644
--- a/website/docs/services/mediaconnect/flow_entitlements/index.md
+++ b/website/docs/services/mediaconnect/flow_entitlements/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>flow_entitlement</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "flow_arn",
@@ -127,6 +136,23 @@ Creates, updates, deletes or gets a <code>flow_entitlement</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "entitlement_arn",
+    "type": "string",
+    "description": "The ARN of the entitlement."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowentitlement.html"><code>AWS::MediaConnect::FlowEntitlement</code></a>.
 
@@ -136,31 +162,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>flow_entitlements</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FlowArn, Name, Subscribers, Description, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>flow_entitlements</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>flow_entitlements</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>flow_entitlements_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>flow_entitlements</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -169,6 +201,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>flow_entitlement</code>.
 ```sql
 SELECT
@@ -184,6 +225,19 @@ subscribers
 FROM awscc.mediaconnect.flow_entitlements
 WHERE region = 'us-east-1' AND data__Identifier = '<EntitlementArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>flow_entitlements</code> in a region.
+```sql
+SELECT
+region,
+entitlement_arn
+FROM awscc.mediaconnect.flow_entitlements_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -284,6 +338,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediaconnect.flow_entitlements
+SET data__PatchDocument = string('{{ {
+    "FlowArn": flow_arn,
+    "Description": description,
+    "Encryption": encryption,
+    "EntitlementStatus": entitlement_status,
+    "Subscribers": subscribers
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<EntitlementArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediaconnect/flow_entitlements_list_only/index.md b/website/docs/services/mediaconnect/flow_entitlements_list_only/index.md
deleted file mode 100644
index 88f558327..000000000
--- a/website/docs/services/mediaconnect/flow_entitlements_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: flow_entitlements_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - flow_entitlements_list_only
-  - mediaconnect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>flow_entitlements</code> in a region or regions, for all properties use <a href="/services/mediaconnect/flow_entitlements/"><code>flow_entitlements</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>flow_entitlements_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaConnect::FlowEntitlement</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediaconnect.flow_entitlements_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "entitlement_arn",
-    "type": "string",
-    "description": "The ARN of the entitlement."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>flow_entitlements</code> in a region.
-```sql
-SELECT
-region,
-entitlement_arn
-FROM awscc.mediaconnect.flow_entitlements_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>flow_entitlements_list_only</code> resource, see <a href="/services/mediaconnect/flow_entitlements/#permissions"><code>flow_entitlements</code></a>
-
diff --git a/website/docs/services/mediaconnect/flow_outputs/index.md b/website/docs/services/mediaconnect/flow_outputs/index.md
index 115d0608e..5eace8f25 100644
--- a/website/docs/services/mediaconnect/flow_outputs/index.md
+++ b/website/docs/services/mediaconnect/flow_outputs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>flow_output</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "flow_arn",
@@ -247,6 +256,23 @@ Creates, updates, deletes or gets a <code>flow_output</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "output_arn",
+    "type": "string",
+    "description": "The ARN of the output."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html"><code>AWS::MediaConnect::FlowOutput</code></a>.
 
@@ -256,31 +282,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>flow_outputs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FlowArn, Protocol, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>flow_outputs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>flow_outputs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>flow_outputs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>flow_outputs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -289,6 +321,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>flow_output</code>.
 ```sql
 SELECT
@@ -315,6 +356,19 @@ ndi_speed_hq_quality
 FROM awscc.mediaconnect.flow_outputs
 WHERE region = 'us-east-1' AND data__Identifier = '<OutputArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>flow_outputs</code> in a region.
+```sql
+SELECT
+region,
+output_arn
+FROM awscc.mediaconnect.flow_outputs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -466,6 +520,35 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediaconnect.flow_outputs
+SET data__PatchDocument = string('{{ {
+    "FlowArn": flow_arn,
+    "CidrAllowList": cidr_allow_list,
+    "Encryption": encryption,
+    "Description": description,
+    "Destination": destination,
+    "MaxLatency": max_latency,
+    "MinLatency": min_latency,
+    "Port": port,
+    "Protocol": protocol,
+    "RemoteId": remote_id,
+    "SmoothingLatency": smoothing_latency,
+    "StreamId": stream_id,
+    "VpcInterfaceAttachment": vpc_interface_attachment,
+    "MediaStreamOutputConfigurations": media_stream_output_configurations,
+    "OutputStatus": output_status,
+    "NdiProgramName": ndi_program_name,
+    "NdiSpeedHqQuality": ndi_speed_hq_quality
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<OutputArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediaconnect/flow_outputs_list_only/index.md b/website/docs/services/mediaconnect/flow_outputs_list_only/index.md
deleted file mode 100644
index 55457b386..000000000
--- a/website/docs/services/mediaconnect/flow_outputs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: flow_outputs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - flow_outputs_list_only
-  - mediaconnect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>flow_outputs</code> in a region or regions, for all properties use <a href="/services/mediaconnect/flow_outputs/"><code>flow_outputs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>flow_outputs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaConnect::FlowOutput</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediaconnect.flow_outputs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "output_arn",
-    "type": "string",
-    "description": "The ARN of the output."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>flow_outputs</code> in a region.
-```sql
-SELECT
-region,
-output_arn
-FROM awscc.mediaconnect.flow_outputs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>flow_outputs_list_only</code> resource, see <a href="/services/mediaconnect/flow_outputs/#permissions"><code>flow_outputs</code></a>
-
diff --git a/website/docs/services/mediaconnect/flow_sources/index.md b/website/docs/services/mediaconnect/flow_sources/index.md
index 2869d5b34..83cd4e3ef 100644
--- a/website/docs/services/mediaconnect/flow_sources/index.md
+++ b/website/docs/services/mediaconnect/flow_sources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>flow_source</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "flow_arn",
@@ -211,6 +220,23 @@ Creates, updates, deletes or gets a <code>flow_source</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "source_arn",
+    "type": "string",
+    "description": "The ARN of the source."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowsource.html"><code>AWS::MediaConnect::FlowSource</code></a>.
 
@@ -220,31 +246,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>flow_sources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Description, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>flow_sources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>flow_sources</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>flow_sources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>flow_sources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -253,6 +285,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>flow_source</code>.
 ```sql
 SELECT
@@ -281,6 +322,19 @@ whitelist_cidr
 FROM awscc.mediaconnect.flow_sources
 WHERE region = 'us-east-1' AND data__Identifier = '<SourceArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>flow_sources</code> in a region.
+```sql
+SELECT
+region,
+source_arn
+FROM awscc.mediaconnect.flow_sources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -423,6 +477,35 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediaconnect.flow_sources
+SET data__PatchDocument = string('{{ {
+    "FlowArn": flow_arn,
+    "Decryption": decryption,
+    "Description": description,
+    "EntitlementArn": entitlement_arn,
+    "GatewayBridgeSource": gateway_bridge_source,
+    "IngestPort": ingest_port,
+    "MaxBitrate": max_bitrate,
+    "MaxLatency": max_latency,
+    "MinLatency": min_latency,
+    "Protocol": protocol,
+    "SenderIpAddress": sender_ip_address,
+    "SenderControlPort": sender_control_port,
+    "StreamId": stream_id,
+    "SourceListenerAddress": source_listener_address,
+    "SourceListenerPort": source_listener_port,
+    "VpcInterfaceName": vpc_interface_name,
+    "WhitelistCidr": whitelist_cidr
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SourceArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediaconnect/flow_sources_list_only/index.md b/website/docs/services/mediaconnect/flow_sources_list_only/index.md
deleted file mode 100644
index 193271846..000000000
--- a/website/docs/services/mediaconnect/flow_sources_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: flow_sources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - flow_sources_list_only
-  - mediaconnect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>flow_sources</code> in a region or regions, for all properties use <a href="/services/mediaconnect/flow_sources/"><code>flow_sources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>flow_sources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaConnect::FlowSource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediaconnect.flow_sources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "source_arn",
-    "type": "string",
-    "description": "The ARN of the source."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>flow_sources</code> in a region.
-```sql
-SELECT
-region,
-source_arn
-FROM awscc.mediaconnect.flow_sources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>flow_sources_list_only</code> resource, see <a href="/services/mediaconnect/flow_sources/#permissions"><code>flow_sources</code></a>
-
diff --git a/website/docs/services/mediaconnect/flow_vpc_interfaces/index.md b/website/docs/services/mediaconnect/flow_vpc_interfaces/index.md
index 8784cfb32..683277b78 100644
--- a/website/docs/services/mediaconnect/flow_vpc_interfaces/index.md
+++ b/website/docs/services/mediaconnect/flow_vpc_interfaces/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>flow_vpc_interface</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "flow_arn",
@@ -70,6 +79,28 @@ Creates, updates, deletes or gets a <code>flow_vpc_interface</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "flow_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN), a unique identifier for any AWS resource, of the flow."
+  },
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Immutable and has to be a unique against other VpcInterfaces in this Flow."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowvpcinterface.html"><code>AWS::MediaConnect::FlowVpcInterface</code></a>.
 
@@ -79,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>flow_vpc_interfaces</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FlowArn, Name, RoleArn, SubnetId, SecurityGroupIds, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>flow_vpc_interfaces</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>flow_vpc_interfaces</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>flow_vpc_interfaces_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>flow_vpc_interfaces</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>flow_vpc_interface</code>.
 ```sql
 SELECT
@@ -125,6 +171,20 @@ network_interface_ids
 FROM awscc.mediaconnect.flow_vpc_interfaces
 WHERE region = 'us-east-1' AND data__Identifier = '<FlowArn>|<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>flow_vpc_interfaces</code> in a region.
+```sql
+SELECT
+region,
+flow_arn,
+name
+FROM awscc.mediaconnect.flow_vpc_interfaces_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -210,6 +270,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediaconnect.flow_vpc_interfaces
+SET data__PatchDocument = string('{{ {
+    "RoleArn": role_arn,
+    "SecurityGroupIds": security_group_ids,
+    "SubnetId": subnet_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FlowArn>|<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediaconnect/flow_vpc_interfaces_list_only/index.md b/website/docs/services/mediaconnect/flow_vpc_interfaces_list_only/index.md
deleted file mode 100644
index ef04fcd6a..000000000
--- a/website/docs/services/mediaconnect/flow_vpc_interfaces_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: flow_vpc_interfaces_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - flow_vpc_interfaces_list_only
-  - mediaconnect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>flow_vpc_interfaces</code> in a region or regions, for all properties use <a href="/services/mediaconnect/flow_vpc_interfaces/"><code>flow_vpc_interfaces</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>flow_vpc_interfaces_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaConnect::FlowVpcInterface</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediaconnect.flow_vpc_interfaces_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "flow_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN), a unique identifier for any AWS resource, of the flow."
-  },
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Immutable and has to be a unique against other VpcInterfaces in this Flow."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>flow_vpc_interfaces</code> in a region.
-```sql
-SELECT
-region,
-flow_arn,
-name
-FROM awscc.mediaconnect.flow_vpc_interfaces_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>flow_vpc_interfaces_list_only</code> resource, see <a href="/services/mediaconnect/flow_vpc_interfaces/#permissions"><code>flow_vpc_interfaces</code></a>
-
diff --git a/website/docs/services/mediaconnect/flows/index.md b/website/docs/services/mediaconnect/flows/index.md
index b276ac467..99eead625 100644
--- a/website/docs/services/mediaconnect/flows/index.md
+++ b/website/docs/services/mediaconnect/flows/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>flow</code> resource or lists <code>fl
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "flow_arn",
@@ -592,6 +601,23 @@ Creates, updates, deletes or gets a <code>flow</code> resource or lists <code>fl
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "flow_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN), a unique identifier for any AWS resource, of the flow."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flow.html"><code>AWS::MediaConnect::Flow</code></a>.
 
@@ -601,31 +627,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>flows</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Source, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>flows</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>flows</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>flows_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>flows</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -634,6 +666,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>flow</code>.
 ```sql
 SELECT
@@ -655,6 +696,19 @@ flow_ndi_machine_name
 FROM awscc.mediaconnect.flows
 WHERE region = 'us-east-1' AND data__Identifier = '<FlowArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>flows</code> in a region.
+```sql
+SELECT
+region,
+flow_arn
+FROM awscc.mediaconnect.flows_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -844,6 +898,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediaconnect.flows
+SET data__PatchDocument = string('{{ {
+    "SourceFailoverConfig": source_failover_config,
+    "Maintenance": maintenance,
+    "SourceMonitoringConfig": source_monitoring_config,
+    "FlowSize": flow_size,
+    "NdiConfig": ndi_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FlowArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediaconnect/flows_list_only/index.md b/website/docs/services/mediaconnect/flows_list_only/index.md
deleted file mode 100644
index cbc67ac47..000000000
--- a/website/docs/services/mediaconnect/flows_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: flows_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - flows_list_only
-  - mediaconnect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>flows</code> in a region or regions, for all properties use <a href="/services/mediaconnect/flows/"><code>flows</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>flows_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaConnect::Flow</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediaconnect.flows_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "flow_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN), a unique identifier for any AWS resource, of the flow."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>flows</code> in a region.
-```sql
-SELECT
-region,
-flow_arn
-FROM awscc.mediaconnect.flows_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>flows_list_only</code> resource, see <a href="/services/mediaconnect/flows/#permissions"><code>flows</code></a>
-
diff --git a/website/docs/services/mediaconnect/gateways/index.md b/website/docs/services/mediaconnect/gateways/index.md
index 70cf5fe42..8e898be0c 100644
--- a/website/docs/services/mediaconnect/gateways/index.md
+++ b/website/docs/services/mediaconnect/gateways/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>gateway</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>gateway</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "gateway_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the gateway."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-gateway.html"><code>AWS::MediaConnect::Gateway</code></a>.
 
@@ -86,26 +112,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>gateways</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, EgressCidrBlocks, Networks, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>gateways</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>gateways_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>gateways</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +145,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>gateway</code>.
 ```sql
 SELECT
@@ -126,6 +166,19 @@ networks
 FROM awscc.mediaconnect.gateways
 WHERE region = 'us-east-1' AND data__Identifier = '<GatewayArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>gateways</code> in a region.
+```sql
+SELECT
+region,
+gateway_arn
+FROM awscc.mediaconnect.gateways_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -201,6 +254,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediaconnect/gateways_list_only/index.md b/website/docs/services/mediaconnect/gateways_list_only/index.md
deleted file mode 100644
index 5e7911722..000000000
--- a/website/docs/services/mediaconnect/gateways_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: gateways_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - gateways_list_only
-  - mediaconnect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>gateways</code> in a region or regions, for all properties use <a href="/services/mediaconnect/gateways/"><code>gateways</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>gateways_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaConnect::Gateway</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediaconnect.gateways_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "gateway_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the gateway."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>gateways</code> in a region.
-```sql
-SELECT
-region,
-gateway_arn
-FROM awscc.mediaconnect.gateways_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>gateways_list_only</code> resource, see <a href="/services/mediaconnect/gateways/#permissions"><code>gateways</code></a>
-
diff --git a/website/docs/services/mediaconnect/index.md b/website/docs/services/mediaconnect/index.md
index 4da68d42d..c51afd627 100644
--- a/website/docs/services/mediaconnect/index.md
+++ b/website/docs/services/mediaconnect/index.md
@@ -20,7 +20,7 @@ The mediaconnect service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>16</b></span><br />
+<span>total resources:&nbsp;<b>9</b></span><br />
 </div>
 </div>
 
@@ -32,20 +32,13 @@ The mediaconnect service documentation.
 <a href="/services/mediaconnect/bridge_outputs/">bridge_outputs</a><br />
 <a href="/services/mediaconnect/bridge_sources/">bridge_sources</a><br />
 <a href="/services/mediaconnect/bridges/">bridges</a><br />
-<a href="/services/mediaconnect/bridges_list_only/">bridges_list_only</a><br />
 <a href="/services/mediaconnect/flow_entitlements/">flow_entitlements</a><br />
-<a href="/services/mediaconnect/flow_entitlements_list_only/">flow_entitlements_list_only</a><br />
-<a href="/services/mediaconnect/flow_outputs/">flow_outputs</a><br />
-<a href="/services/mediaconnect/flow_outputs_list_only/">flow_outputs_list_only</a>
+<a href="/services/mediaconnect/flow_outputs/">flow_outputs</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/mediaconnect/flow_sources/">flow_sources</a><br />
-<a href="/services/mediaconnect/flow_sources_list_only/">flow_sources_list_only</a><br />
 <a href="/services/mediaconnect/flow_vpc_interfaces/">flow_vpc_interfaces</a><br />
-<a href="/services/mediaconnect/flow_vpc_interfaces_list_only/">flow_vpc_interfaces_list_only</a><br />
 <a href="/services/mediaconnect/flows/">flows</a><br />
-<a href="/services/mediaconnect/flows_list_only/">flows_list_only</a><br />
-<a href="/services/mediaconnect/gateways/">gateways</a><br />
-<a href="/services/mediaconnect/gateways_list_only/">gateways_list_only</a>
+<a href="/services/mediaconnect/gateways/">gateways</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/medialive/channel_placement_groups/index.md b/website/docs/services/medialive/channel_placement_groups/index.md
index 5d2ebe769..15b1bf029 100644
--- a/website/docs/services/medialive/channel_placement_groups/index.md
+++ b/website/docs/services/medialive/channel_placement_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>channel_placement_group</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -92,6 +101,28 @@ Creates, updates, deletes or gets a <code>channel_placement_group</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_id",
+    "type": "string",
+    "description": "The ID of the cluster the node is on."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Unique internal identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channelplacementgroup.html"><code>AWS::MediaLive::ChannelPlacementGroup</code></a>.
 
@@ -101,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>channel_placement_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>channel_placement_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>channel_placement_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>channel_placement_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>channel_placement_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>channel_placement_group</code>.
 ```sql
 SELECT
@@ -149,6 +195,20 @@ tags
 FROM awscc.medialive.channel_placement_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>|<ClusterId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>channel_placement_groups</code> in a region.
+```sql
+SELECT
+region,
+id,
+cluster_id
+FROM awscc.medialive.channel_placement_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -230,6 +290,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.medialive.channel_placement_groups
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Nodes": nodes,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>|<ClusterId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/medialive/channel_placement_groups_list_only/index.md b/website/docs/services/medialive/channel_placement_groups_list_only/index.md
deleted file mode 100644
index 18f48d05a..000000000
--- a/website/docs/services/medialive/channel_placement_groups_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: channel_placement_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - channel_placement_groups_list_only
-  - medialive
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>channel_placement_groups</code> in a region or regions, for all properties use <a href="/services/medialive/channel_placement_groups/"><code>channel_placement_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>channel_placement_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::MediaLive::ChannelPlacementGroup Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.medialive.channel_placement_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cluster_id",
-    "type": "string",
-    "description": "The ID of the cluster the node is on."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Unique internal identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>channel_placement_groups</code> in a region.
-```sql
-SELECT
-region,
-id,
-cluster_id
-FROM awscc.medialive.channel_placement_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>channel_placement_groups_list_only</code> resource, see <a href="/services/medialive/channel_placement_groups/#permissions"><code>channel_placement_groups</code></a>
-
diff --git a/website/docs/services/medialive/cloud_watch_alarm_template_groups/index.md b/website/docs/services/medialive/cloud_watch_alarm_template_groups/index.md
index 4e533a291..853b8e1cb 100644
--- a/website/docs/services/medialive/cloud_watch_alarm_template_groups/index.md
+++ b/website/docs/services/medialive/cloud_watch_alarm_template_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cloud_watch_alarm_template_group</code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -80,6 +89,28 @@ Creates, updates, deletes or gets a <code>cloud_watch_alarm_template_group</code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "A cloudwatch alarm template group's id. AWS provided template groups have ids that start with &#96;aws-&#96;"
+  },
+  {
+    "name": "identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplategroup.html"><code>AWS::MediaLive::CloudWatchAlarmTemplateGroup</code></a>.
 
@@ -89,31 +120,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cloud_watch_alarm_template_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cloud_watch_alarm_template_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cloud_watch_alarm_template_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cloud_watch_alarm_template_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cloud_watch_alarm_template_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -122,6 +159,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cloud_watch_alarm_template_group</code>.
 ```sql
 SELECT
@@ -137,6 +183,19 @@ tags
 FROM awscc.medialive.cloud_watch_alarm_template_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Identifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cloud_watch_alarm_template_groups</code> in a region.
+```sql
+SELECT
+region,
+identifier
+FROM awscc.medialive.cloud_watch_alarm_template_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +264,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.medialive.cloud_watch_alarm_template_groups
+SET data__PatchDocument = string('{{ {
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Identifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/medialive/cloud_watch_alarm_template_groups_list_only/index.md b/website/docs/services/medialive/cloud_watch_alarm_template_groups_list_only/index.md
deleted file mode 100644
index 2371ab7f4..000000000
--- a/website/docs/services/medialive/cloud_watch_alarm_template_groups_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: cloud_watch_alarm_template_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cloud_watch_alarm_template_groups_list_only
-  - medialive
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cloud_watch_alarm_template_groups</code> in a region or regions, for all properties use <a href="/services/medialive/cloud_watch_alarm_template_groups/"><code>cloud_watch_alarm_template_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cloud_watch_alarm_template_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::MediaLive::CloudWatchAlarmTemplateGroup Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.medialive.cloud_watch_alarm_template_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "A cloudwatch alarm template group's id. AWS provided template groups have ids that start with &#96;aws-&#96;"
-  },
-  {
-    "name": "identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cloud_watch_alarm_template_groups</code> in a region.
-```sql
-SELECT
-region,
-identifier
-FROM awscc.medialive.cloud_watch_alarm_template_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cloud_watch_alarm_template_groups_list_only</code> resource, see <a href="/services/medialive/cloud_watch_alarm_template_groups/#permissions"><code>cloud_watch_alarm_template_groups</code></a>
-
diff --git a/website/docs/services/medialive/cloud_watch_alarm_templates/index.md b/website/docs/services/medialive/cloud_watch_alarm_templates/index.md
index 6830b9db5..218ae3314 100644
--- a/website/docs/services/medialive/cloud_watch_alarm_templates/index.md
+++ b/website/docs/services/medialive/cloud_watch_alarm_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cloud_watch_alarm_template</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -135,6 +144,28 @@ Creates, updates, deletes or gets a <code>cloud_watch_alarm_template</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "A cloudwatch alarm template's id. AWS provided templates have ids that start with &#96;aws-&#96;"
+  },
+  {
+    "name": "identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplate.html"><code>AWS::MediaLive::CloudWatchAlarmTemplate</code></a>.
 
@@ -144,31 +175,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cloud_watch_alarm_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ComparisonOperator, EvaluationPeriods, MetricName, Name, Period, Statistic, TargetResourceType, Threshold, TreatMissingData, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cloud_watch_alarm_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cloud_watch_alarm_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cloud_watch_alarm_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cloud_watch_alarm_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -177,6 +214,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cloud_watch_alarm_template</code>.
 ```sql
 SELECT
@@ -203,6 +249,19 @@ treat_missing_data
 FROM awscc.medialive.cloud_watch_alarm_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<Identifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cloud_watch_alarm_templates</code> in a region.
+```sql
+SELECT
+region,
+identifier
+FROM awscc.medialive.cloud_watch_alarm_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -327,6 +386,30 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.medialive.cloud_watch_alarm_templates
+SET data__PatchDocument = string('{{ {
+    "ComparisonOperator": comparison_operator,
+    "DatapointsToAlarm": datapoints_to_alarm,
+    "Description": description,
+    "EvaluationPeriods": evaluation_periods,
+    "GroupIdentifier": group_identifier,
+    "MetricName": metric_name,
+    "Name": name,
+    "Period": period,
+    "Statistic": statistic,
+    "TargetResourceType": target_resource_type,
+    "Threshold": threshold,
+    "TreatMissingData": treat_missing_data
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Identifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/medialive/cloud_watch_alarm_templates_list_only/index.md b/website/docs/services/medialive/cloud_watch_alarm_templates_list_only/index.md
deleted file mode 100644
index 363dedacd..000000000
--- a/website/docs/services/medialive/cloud_watch_alarm_templates_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: cloud_watch_alarm_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cloud_watch_alarm_templates_list_only
-  - medialive
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cloud_watch_alarm_templates</code> in a region or regions, for all properties use <a href="/services/medialive/cloud_watch_alarm_templates/"><code>cloud_watch_alarm_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cloud_watch_alarm_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::MediaLive::CloudWatchAlarmTemplate Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.medialive.cloud_watch_alarm_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "A cloudwatch alarm template's id. AWS provided templates have ids that start with &#96;aws-&#96;"
-  },
-  {
-    "name": "identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cloud_watch_alarm_templates</code> in a region.
-```sql
-SELECT
-region,
-identifier
-FROM awscc.medialive.cloud_watch_alarm_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cloud_watch_alarm_templates_list_only</code> resource, see <a href="/services/medialive/cloud_watch_alarm_templates/#permissions"><code>cloud_watch_alarm_templates</code></a>
-
diff --git a/website/docs/services/medialive/clusters/index.md b/website/docs/services/medialive/clusters/index.md
index f3e065512..12e179c40 100644
--- a/website/docs/services/medialive/clusters/index.md
+++ b/website/docs/services/medialive/clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -121,6 +130,23 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The unique ID of the Cluster."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cluster.html"><code>AWS::MediaLive::Cluster</code></a>.
 
@@ -130,31 +156,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -163,6 +195,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cluster</code>.
 ```sql
 SELECT
@@ -179,6 +220,19 @@ tags
 FROM awscc.medialive.clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>clusters</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.medialive.clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -269,6 +323,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.medialive.clusters
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "NetworkSettings": network_settings,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/medialive/clusters_list_only/index.md b/website/docs/services/medialive/clusters_list_only/index.md
deleted file mode 100644
index 38c73bdee..000000000
--- a/website/docs/services/medialive/clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - clusters_list_only
-  - medialive
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>clusters</code> in a region or regions, for all properties use <a href="/services/medialive/clusters/"><code>clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::MediaLive::Cluster Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.medialive.clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The unique ID of the Cluster."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>clusters</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.medialive.clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>clusters_list_only</code> resource, see <a href="/services/medialive/clusters/#permissions"><code>clusters</code></a>
-
diff --git a/website/docs/services/medialive/event_bridge_rule_template_groups/index.md b/website/docs/services/medialive/event_bridge_rule_template_groups/index.md
index 03cceec29..8ff83cce3 100644
--- a/website/docs/services/medialive/event_bridge_rule_template_groups/index.md
+++ b/website/docs/services/medialive/event_bridge_rule_template_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>event_bridge_rule_template_group</cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -80,6 +89,28 @@ Creates, updates, deletes or gets an <code>event_bridge_rule_template_group</cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "An eventbridge rule template group's id. AWS provided template groups have ids that start with &#96;aws-&#96;"
+  },
+  {
+    "name": "identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-eventbridgeruletemplategroup.html"><code>AWS::MediaLive::EventBridgeRuleTemplateGroup</code></a>.
 
@@ -89,31 +120,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>event_bridge_rule_template_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>event_bridge_rule_template_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>event_bridge_rule_template_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>event_bridge_rule_template_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>event_bridge_rule_template_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -122,6 +159,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>event_bridge_rule_template_group</code>.
 ```sql
 SELECT
@@ -137,6 +183,19 @@ tags
 FROM awscc.medialive.event_bridge_rule_template_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Identifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>event_bridge_rule_template_groups</code> in a region.
+```sql
+SELECT
+region,
+identifier
+FROM awscc.medialive.event_bridge_rule_template_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +264,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.medialive.event_bridge_rule_template_groups
+SET data__PatchDocument = string('{{ {
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Identifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/medialive/event_bridge_rule_template_groups_list_only/index.md b/website/docs/services/medialive/event_bridge_rule_template_groups_list_only/index.md
deleted file mode 100644
index 6d7ccb274..000000000
--- a/website/docs/services/medialive/event_bridge_rule_template_groups_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: event_bridge_rule_template_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - event_bridge_rule_template_groups_list_only
-  - medialive
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>event_bridge_rule_template_groups</code> in a region or regions, for all properties use <a href="/services/medialive/event_bridge_rule_template_groups/"><code>event_bridge_rule_template_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>event_bridge_rule_template_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::MediaLive::EventBridgeRuleTemplateGroup Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.medialive.event_bridge_rule_template_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "An eventbridge rule template group's id. AWS provided template groups have ids that start with &#96;aws-&#96;"
-  },
-  {
-    "name": "identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>event_bridge_rule_template_groups</code> in a region.
-```sql
-SELECT
-region,
-identifier
-FROM awscc.medialive.event_bridge_rule_template_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>event_bridge_rule_template_groups_list_only</code> resource, see <a href="/services/medialive/event_bridge_rule_template_groups/#permissions"><code>event_bridge_rule_template_groups</code></a>
-
diff --git a/website/docs/services/medialive/event_bridge_rule_templates/index.md b/website/docs/services/medialive/event_bridge_rule_templates/index.md
index 88fceedfe..d573df8f1 100644
--- a/website/docs/services/medialive/event_bridge_rule_templates/index.md
+++ b/website/docs/services/medialive/event_bridge_rule_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>event_bridge_rule_template</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -107,6 +116,28 @@ Creates, updates, deletes or gets an <code>event_bridge_rule_template</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "An eventbridge rule template's id. AWS provided templates have ids that start with &#96;aws-&#96;"
+  },
+  {
+    "name": "identifier",
+    "type": "string",
+    "description": "Placeholder documentation for &#95;&#95;string"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-eventbridgeruletemplate.html"><code>AWS::MediaLive::EventBridgeRuleTemplate</code></a>.
 
@@ -116,31 +147,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>event_bridge_rule_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EventType, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>event_bridge_rule_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>event_bridge_rule_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>event_bridge_rule_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>event_bridge_rule_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -149,6 +186,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>event_bridge_rule_template</code>.
 ```sql
 SELECT
@@ -168,6 +214,19 @@ tags
 FROM awscc.medialive.event_bridge_rule_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<Identifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>event_bridge_rule_templates</code> in a region.
+```sql
+SELECT
+region,
+identifier
+FROM awscc.medialive.event_bridge_rule_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -251,6 +310,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.medialive.event_bridge_rule_templates
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "EventTargets": event_targets,
+    "EventType": event_type,
+    "GroupIdentifier": group_identifier,
+    "Name": name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Identifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/medialive/event_bridge_rule_templates_list_only/index.md b/website/docs/services/medialive/event_bridge_rule_templates_list_only/index.md
deleted file mode 100644
index b08d894f8..000000000
--- a/website/docs/services/medialive/event_bridge_rule_templates_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: event_bridge_rule_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - event_bridge_rule_templates_list_only
-  - medialive
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>event_bridge_rule_templates</code> in a region or regions, for all properties use <a href="/services/medialive/event_bridge_rule_templates/"><code>event_bridge_rule_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>event_bridge_rule_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::MediaLive::EventBridgeRuleTemplate Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.medialive.event_bridge_rule_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "An eventbridge rule template's id. AWS provided templates have ids that start with &#96;aws-&#96;"
-  },
-  {
-    "name": "identifier",
-    "type": "string",
-    "description": "Placeholder documentation for &#95;&#95;string"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>event_bridge_rule_templates</code> in a region.
-```sql
-SELECT
-region,
-identifier
-FROM awscc.medialive.event_bridge_rule_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>event_bridge_rule_templates_list_only</code> resource, see <a href="/services/medialive/event_bridge_rule_templates/#permissions"><code>event_bridge_rule_templates</code></a>
-
diff --git a/website/docs/services/medialive/index.md b/website/docs/services/medialive/index.md
index 61b19642b..e624660db 100644
--- a/website/docs/services/medialive/index.md
+++ b/website/docs/services/medialive/index.md
@@ -20,7 +20,7 @@ The medialive service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>22</b></span><br />
+<span>total resources:&nbsp;<b>11</b></span><br />
 </div>
 </div>
 
@@ -30,28 +30,17 @@ The medialive service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/medialive/channel_placement_groups/">channel_placement_groups</a><br />
-<a href="/services/medialive/channel_placement_groups_list_only/">channel_placement_groups_list_only</a><br />
 <a href="/services/medialive/cloud_watch_alarm_template_groups/">cloud_watch_alarm_template_groups</a><br />
-<a href="/services/medialive/cloud_watch_alarm_template_groups_list_only/">cloud_watch_alarm_template_groups_list_only</a><br />
 <a href="/services/medialive/cloud_watch_alarm_templates/">cloud_watch_alarm_templates</a><br />
-<a href="/services/medialive/cloud_watch_alarm_templates_list_only/">cloud_watch_alarm_templates_list_only</a><br />
 <a href="/services/medialive/clusters/">clusters</a><br />
-<a href="/services/medialive/clusters_list_only/">clusters_list_only</a><br />
 <a href="/services/medialive/event_bridge_rule_template_groups/">event_bridge_rule_template_groups</a><br />
-<a href="/services/medialive/event_bridge_rule_template_groups_list_only/">event_bridge_rule_template_groups_list_only</a><br />
 <a href="/services/medialive/event_bridge_rule_templates/">event_bridge_rule_templates</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/medialive/event_bridge_rule_templates_list_only/">event_bridge_rule_templates_list_only</a><br />
 <a href="/services/medialive/multiplexes/">multiplexes</a><br />
-<a href="/services/medialive/multiplexes_list_only/">multiplexes_list_only</a><br />
 <a href="/services/medialive/multiplexprograms/">multiplexprograms</a><br />
-<a href="/services/medialive/multiplexprograms_list_only/">multiplexprograms_list_only</a><br />
 <a href="/services/medialive/networks/">networks</a><br />
-<a href="/services/medialive/networks_list_only/">networks_list_only</a><br />
 <a href="/services/medialive/sdi_sources/">sdi_sources</a><br />
-<a href="/services/medialive/sdi_sources_list_only/">sdi_sources_list_only</a><br />
-<a href="/services/medialive/signal_maps/">signal_maps</a><br />
-<a href="/services/medialive/signal_maps_list_only/">signal_maps_list_only</a>
+<a href="/services/medialive/signal_maps/">signal_maps</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/medialive/multiplexes/index.md b/website/docs/services/medialive/multiplexes/index.md
index d6210edc4..2a74ab11f 100644
--- a/website/docs/services/medialive/multiplexes/index.md
+++ b/website/docs/services/medialive/multiplexes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>multiplex</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -131,6 +140,23 @@ Creates, updates, deletes or gets a <code>multiplex</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The unique id of the multiplex."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-multiplex.html"><code>AWS::MediaLive::Multiplex</code></a>.
 
@@ -140,31 +166,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>multiplexes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AvailabilityZones, MultiplexSettings, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>multiplexes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>multiplexes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>multiplexes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>multiplexes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -173,6 +205,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>multiplex</code>.
 ```sql
 SELECT
@@ -190,6 +231,19 @@ tags
 FROM awscc.medialive.multiplexes
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>multiplexes</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.medialive.multiplexes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -278,6 +332,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.medialive.multiplexes
+SET data__PatchDocument = string('{{ {
+    "Destinations": destinations,
+    "MultiplexSettings": multiplex_settings,
+    "Name": name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/medialive/multiplexes_list_only/index.md b/website/docs/services/medialive/multiplexes_list_only/index.md
deleted file mode 100644
index c6554c24f..000000000
--- a/website/docs/services/medialive/multiplexes_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: multiplexes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - multiplexes_list_only
-  - medialive
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>multiplexes</code> in a region or regions, for all properties use <a href="/services/medialive/multiplexes/"><code>multiplexes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>multiplexes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaLive::Multiplex</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.medialive.multiplexes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The unique id of the multiplex."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>multiplexes</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.medialive.multiplexes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>multiplexes_list_only</code> resource, see <a href="/services/medialive/multiplexes/#permissions"><code>multiplexes</code></a>
-
diff --git a/website/docs/services/medialive/multiplexprograms/index.md b/website/docs/services/medialive/multiplexprograms/index.md
index 69d5bd86f..d5028f39e 100644
--- a/website/docs/services/medialive/multiplexprograms/index.md
+++ b/website/docs/services/medialive/multiplexprograms/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>multiplexprogram</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "channel_id",
@@ -188,6 +197,28 @@ Creates, updates, deletes or gets a <code>multiplexprogram</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "multiplex_id",
+    "type": "string",
+    "description": "The ID of the multiplex that the program belongs to."
+  },
+  {
+    "name": "program_name",
+    "type": "string",
+    "description": "The name of the multiplex program."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-multiplexprogram.html"><code>AWS::MediaLive::Multiplexprogram</code></a>.
 
@@ -197,31 +228,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>multiplexprograms</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>multiplexprograms</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>multiplexprograms</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>multiplexprograms_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>multiplexprograms</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -230,6 +267,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>multiplexprogram</code>.
 ```sql
 SELECT
@@ -244,6 +290,20 @@ program_name
 FROM awscc.medialive.multiplexprograms
 WHERE region = 'us-east-1' AND data__Identifier = '<ProgramName>|<MultiplexId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>multiplexprograms</code> in a region.
+```sql
+SELECT
+region,
+program_name,
+multiplex_id
+FROM awscc.medialive.multiplexprograms_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -359,6 +419,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.medialive.multiplexprograms
+SET data__PatchDocument = string('{{ {
+    "MultiplexProgramSettings": multiplex_program_settings,
+    "PreferredChannelPipeline": preferred_channel_pipeline,
+    "PacketIdentifiersMap": packet_identifiers_map,
+    "PipelineDetails": pipeline_details
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ProgramName>|<MultiplexId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/medialive/multiplexprograms_list_only/index.md b/website/docs/services/medialive/multiplexprograms_list_only/index.md
deleted file mode 100644
index 9358450fe..000000000
--- a/website/docs/services/medialive/multiplexprograms_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: multiplexprograms_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - multiplexprograms_list_only
-  - medialive
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>multiplexprograms</code> in a region or regions, for all properties use <a href="/services/medialive/multiplexprograms/"><code>multiplexprograms</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>multiplexprograms_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaLive::Multiplexprogram</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.medialive.multiplexprograms_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "multiplex_id",
-    "type": "string",
-    "description": "The ID of the multiplex that the program belongs to."
-  },
-  {
-    "name": "program_name",
-    "type": "string",
-    "description": "The name of the multiplex program."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>multiplexprograms</code> in a region.
-```sql
-SELECT
-region,
-program_name,
-multiplex_id
-FROM awscc.medialive.multiplexprograms_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>multiplexprograms_list_only</code> resource, see <a href="/services/medialive/multiplexprograms/#permissions"><code>multiplexprograms</code></a>
-
diff --git a/website/docs/services/medialive/networks/index.md b/website/docs/services/medialive/networks/index.md
index 375c28fcf..7ff999712 100644
--- a/website/docs/services/medialive/networks/index.md
+++ b/website/docs/services/medialive/networks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>network</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -111,6 +120,23 @@ Creates, updates, deletes or gets a <code>network</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The unique ID of the Network."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-network.html"><code>AWS::MediaLive::Network</code></a>.
 
@@ -120,31 +146,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>networks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, IpPools, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>networks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>networks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>networks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>networks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -153,6 +185,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>network</code>.
 ```sql
 SELECT
@@ -168,6 +209,19 @@ tags
 FROM awscc.medialive.networks
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>networks</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.medialive.networks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -247,6 +301,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.medialive.networks
+SET data__PatchDocument = string('{{ {
+    "IpPools": ip_pools,
+    "Name": name,
+    "Routes": routes,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/medialive/networks_list_only/index.md b/website/docs/services/medialive/networks_list_only/index.md
deleted file mode 100644
index 3b38874f0..000000000
--- a/website/docs/services/medialive/networks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: networks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - networks_list_only
-  - medialive
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>networks</code> in a region or regions, for all properties use <a href="/services/medialive/networks/"><code>networks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>networks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaLive::Network.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.medialive.networks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The unique ID of the Network."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>networks</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.medialive.networks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>networks_list_only</code> resource, see <a href="/services/medialive/networks/#permissions"><code>networks</code></a>
-
diff --git a/website/docs/services/medialive/sdi_sources/index.md b/website/docs/services/medialive/sdi_sources/index.md
index 3c0e53a93..b22afbbd2 100644
--- a/website/docs/services/medialive/sdi_sources/index.md
+++ b/website/docs/services/medialive/sdi_sources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>sdi_source</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>sdi_source</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The unique identifier of the SdiSource."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-sdisource.html"><code>AWS::MediaLive::SdiSource</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>sdi_sources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>sdi_sources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>sdi_sources</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>sdi_sources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>sdi_sources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>sdi_source</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.medialive.sdi_sources
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>sdi_sources</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.medialive.sdi_sources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -225,6 +279,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.medialive.sdi_sources
+SET data__PatchDocument = string('{{ {
+    "Mode": mode,
+    "Name": name,
+    "Type": type,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/medialive/sdi_sources_list_only/index.md b/website/docs/services/medialive/sdi_sources_list_only/index.md
deleted file mode 100644
index f6dfc1ec9..000000000
--- a/website/docs/services/medialive/sdi_sources_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: sdi_sources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - sdi_sources_list_only
-  - medialive
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>sdi_sources</code> in a region or regions, for all properties use <a href="/services/medialive/sdi_sources/"><code>sdi_sources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>sdi_sources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::MediaLive::SdiSource Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.medialive.sdi_sources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The unique identifier of the SdiSource."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>sdi_sources</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.medialive.sdi_sources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>sdi_sources_list_only</code> resource, see <a href="/services/medialive/sdi_sources/#permissions"><code>sdi_sources</code></a>
-
diff --git a/website/docs/services/medialive/signal_maps/index.md b/website/docs/services/medialive/signal_maps/index.md
index 00bc0b6ee..14fa06305 100644
--- a/website/docs/services/medialive/signal_maps/index.md
+++ b/website/docs/services/medialive/signal_maps/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>signal_map</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -179,6 +188,28 @@ Creates, updates, deletes or gets a <code>signal_map</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "A signal map's id."
+  },
+  {
+    "name": "identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-signalmap.html"><code>AWS::MediaLive::SignalMap</code></a>.
 
@@ -188,31 +219,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>signal_maps</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DiscoveryEntryPointArn, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>signal_maps</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>signal_maps</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>signal_maps_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>signal_maps</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -221,6 +258,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>signal_map</code>.
 ```sql
 SELECT
@@ -250,6 +296,19 @@ tags
 FROM awscc.medialive.signal_maps
 WHERE region = 'us-east-1' AND data__Identifier = '<Identifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>signal_maps</code> in a region.
+```sql
+SELECT
+region,
+identifier
+FROM awscc.medialive.signal_maps_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -338,6 +397,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.medialive.signal_maps
+SET data__PatchDocument = string('{{ {
+    "CloudWatchAlarmTemplateGroupIdentifiers": cloud_watch_alarm_template_group_identifiers,
+    "Description": description,
+    "DiscoveryEntryPointArn": discovery_entry_point_arn,
+    "EventBridgeRuleTemplateGroupIdentifiers": event_bridge_rule_template_group_identifiers,
+    "ForceRediscovery": force_rediscovery,
+    "Name": name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Identifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/medialive/signal_maps_list_only/index.md b/website/docs/services/medialive/signal_maps_list_only/index.md
deleted file mode 100644
index 5511d13b5..000000000
--- a/website/docs/services/medialive/signal_maps_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: signal_maps_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - signal_maps_list_only
-  - medialive
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>signal_maps</code> in a region or regions, for all properties use <a href="/services/medialive/signal_maps/"><code>signal_maps</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>signal_maps_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::MediaLive::SignalMap Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.medialive.signal_maps_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "A signal map's id."
-  },
-  {
-    "name": "identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>signal_maps</code> in a region.
-```sql
-SELECT
-region,
-identifier
-FROM awscc.medialive.signal_maps_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>signal_maps_list_only</code> resource, see <a href="/services/medialive/signal_maps/#permissions"><code>signal_maps</code></a>
-
diff --git a/website/docs/services/mediapackage/assets/index.md b/website/docs/services/mediapackage/assets/index.md
index 0b2d1e896..3fb42ea9f 100644
--- a/website/docs/services/mediapackage/assets/index.md
+++ b/website/docs/services/mediapackage/assets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>asset</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -109,6 +118,23 @@ Creates, updates, deletes or gets an <code>asset</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The unique identifier for the Asset."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html"><code>AWS::MediaPackage::Asset</code></a>.
 
@@ -118,26 +144,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>assets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Id, PackagingGroupId, SourceArn, SourceRoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>assets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>assets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>assets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -146,6 +177,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>asset</code>.
 ```sql
 SELECT
@@ -162,6 +202,19 @@ tags
 FROM awscc.mediapackage.assets
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>assets</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.mediapackage.assets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -256,6 +309,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediapackage/assets_list_only/index.md b/website/docs/services/mediapackage/assets_list_only/index.md
deleted file mode 100644
index c100e3e1a..000000000
--- a/website/docs/services/mediapackage/assets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: assets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - assets_list_only
-  - mediapackage
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>assets</code> in a region or regions, for all properties use <a href="/services/mediapackage/assets/"><code>assets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>assets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaPackage::Asset</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediapackage.assets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The unique identifier for the Asset."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>assets</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.mediapackage.assets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>assets_list_only</code> resource, see <a href="/services/mediapackage/assets/#permissions"><code>assets</code></a>
-
diff --git a/website/docs/services/mediapackage/channels/index.md b/website/docs/services/mediapackage/channels/index.md
index 97b8624f3..cc23696ba 100644
--- a/website/docs/services/mediapackage/channels/index.md
+++ b/website/docs/services/mediapackage/channels/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>channel</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -118,6 +127,23 @@ Creates, updates, deletes or gets a <code>channel</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the Channel."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-channel.html"><code>AWS::MediaPackage::Channel</code></a>.
 
@@ -127,31 +153,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Id, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>channels_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -160,6 +192,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>channel</code>.
 ```sql
 SELECT
@@ -174,6 +215,19 @@ ingress_access_logs
 FROM awscc.mediapackage.channels
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>channels</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.mediapackage.channels_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -262,6 +316,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediapackage.channels
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "EgressAccessLogs": egress_access_logs,
+    "IngressAccessLogs": ingress_access_logs
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediapackage/channels_list_only/index.md b/website/docs/services/mediapackage/channels_list_only/index.md
deleted file mode 100644
index 3ec5803dd..000000000
--- a/website/docs/services/mediapackage/channels_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: channels_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - channels_list_only
-  - mediapackage
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>channels</code> in a region or regions, for all properties use <a href="/services/mediapackage/channels/"><code>channels</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>channels_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaPackage::Channel</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediapackage.channels_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the Channel."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>channels</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.mediapackage.channels_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>channels_list_only</code> resource, see <a href="/services/mediapackage/channels/#permissions"><code>channels</code></a>
-
diff --git a/website/docs/services/mediapackage/index.md b/website/docs/services/mediapackage/index.md
index 36bc64c37..9e9566c78 100644
--- a/website/docs/services/mediapackage/index.md
+++ b/website/docs/services/mediapackage/index.md
@@ -20,7 +20,7 @@ The mediapackage service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>10</b></span><br />
+<span>total resources:&nbsp;<b>5</b></span><br />
 </div>
 </div>
 
@@ -30,16 +30,11 @@ The mediapackage service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/mediapackage/assets/">assets</a><br />
-<a href="/services/mediapackage/assets_list_only/">assets_list_only</a><br />
 <a href="/services/mediapackage/channels/">channels</a><br />
-<a href="/services/mediapackage/channels_list_only/">channels_list_only</a><br />
 <a href="/services/mediapackage/origin_endpoints/">origin_endpoints</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/mediapackage/origin_endpoints_list_only/">origin_endpoints_list_only</a><br />
 <a href="/services/mediapackage/packaging_configurations/">packaging_configurations</a><br />
-<a href="/services/mediapackage/packaging_configurations_list_only/">packaging_configurations_list_only</a><br />
-<a href="/services/mediapackage/packaging_groups/">packaging_groups</a><br />
-<a href="/services/mediapackage/packaging_groups_list_only/">packaging_groups_list_only</a>
+<a href="/services/mediapackage/packaging_groups/">packaging_groups</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/mediapackage/origin_endpoints/index.md b/website/docs/services/mediapackage/origin_endpoints/index.md
index 87c88ec2a..cf92df278 100644
--- a/website/docs/services/mediapackage/origin_endpoints/index.md
+++ b/website/docs/services/mediapackage/origin_endpoints/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>origin_endpoint</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -549,6 +558,23 @@ Creates, updates, deletes or gets an <code>origin_endpoint</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the OriginEndpoint."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html"><code>AWS::MediaPackage::OriginEndpoint</code></a>.
 
@@ -558,31 +584,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>origin_endpoints</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Id, ChannelId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>origin_endpoints</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>origin_endpoints</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>origin_endpoints_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>origin_endpoints</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -591,6 +623,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>origin_endpoint</code>.
 ```sql
 SELECT
@@ -614,6 +655,19 @@ tags
 FROM awscc.mediapackage.origin_endpoints
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>origin_endpoints</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.mediapackage.origin_endpoints_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -784,6 +838,31 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediapackage.origin_endpoints
+SET data__PatchDocument = string('{{ {
+    "ChannelId": channel_id,
+    "Description": description,
+    "Whitelist": whitelist,
+    "StartoverWindowSeconds": startover_window_seconds,
+    "TimeDelaySeconds": time_delay_seconds,
+    "ManifestName": manifest_name,
+    "Origination": origination,
+    "Authorization": authorization,
+    "HlsPackage": hls_package,
+    "DashPackage": dash_package,
+    "MssPackage": mss_package,
+    "CmafPackage": cmaf_package,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediapackage/origin_endpoints_list_only/index.md b/website/docs/services/mediapackage/origin_endpoints_list_only/index.md
deleted file mode 100644
index 9c2d0c3f2..000000000
--- a/website/docs/services/mediapackage/origin_endpoints_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: origin_endpoints_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - origin_endpoints_list_only
-  - mediapackage
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>origin_endpoints</code> in a region or regions, for all properties use <a href="/services/mediapackage/origin_endpoints/"><code>origin_endpoints</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>origin_endpoints_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaPackage::OriginEndpoint</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediapackage.origin_endpoints_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the OriginEndpoint."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>origin_endpoints</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.mediapackage.origin_endpoints_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>origin_endpoints_list_only</code> resource, see <a href="/services/mediapackage/origin_endpoints/#permissions"><code>origin_endpoints</code></a>
-
diff --git a/website/docs/services/mediapackage/packaging_configurations/index.md b/website/docs/services/mediapackage/packaging_configurations/index.md
index 2d4d9d076..cdb80420e 100644
--- a/website/docs/services/mediapackage/packaging_configurations/index.md
+++ b/website/docs/services/mediapackage/packaging_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>packaging_configuration</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -497,6 +506,23 @@ Creates, updates, deletes or gets a <code>packaging_configuration</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the PackagingConfiguration."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packagingconfiguration.html"><code>AWS::MediaPackage::PackagingConfiguration</code></a>.
 
@@ -506,26 +532,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>packaging_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PackagingGroupId, Id, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>packaging_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>packaging_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>packaging_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -534,6 +565,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>packaging_configuration</code>.
 ```sql
 SELECT
@@ -549,6 +589,19 @@ tags
 FROM awscc.mediapackage.packaging_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>packaging_configurations</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.mediapackage.packaging_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -688,6 +741,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediapackage/packaging_configurations_list_only/index.md b/website/docs/services/mediapackage/packaging_configurations_list_only/index.md
deleted file mode 100644
index cde77aa09..000000000
--- a/website/docs/services/mediapackage/packaging_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: packaging_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - packaging_configurations_list_only
-  - mediapackage
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>packaging_configurations</code> in a region or regions, for all properties use <a href="/services/mediapackage/packaging_configurations/"><code>packaging_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>packaging_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaPackage::PackagingConfiguration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediapackage.packaging_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the PackagingConfiguration."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>packaging_configurations</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.mediapackage.packaging_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>packaging_configurations_list_only</code> resource, see <a href="/services/mediapackage/packaging_configurations/#permissions"><code>packaging_configurations</code></a>
-
diff --git a/website/docs/services/mediapackage/packaging_groups/index.md b/website/docs/services/mediapackage/packaging_groups/index.md
index e3236f060..f34b861a1 100644
--- a/website/docs/services/mediapackage/packaging_groups/index.md
+++ b/website/docs/services/mediapackage/packaging_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>packaging_group</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -101,6 +110,23 @@ Creates, updates, deletes or gets a <code>packaging_group</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the PackagingGroup."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packaginggroup.html"><code>AWS::MediaPackage::PackagingGroup</code></a>.
 
@@ -110,31 +136,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>packaging_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Id, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>packaging_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>packaging_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>packaging_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>packaging_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -143,6 +175,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>packaging_group</code>.
 ```sql
 SELECT
@@ -156,6 +197,19 @@ egress_access_logs
 FROM awscc.mediapackage.packaging_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>packaging_groups</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.mediapackage.packaging_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -233,6 +287,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediapackage.packaging_groups
+SET data__PatchDocument = string('{{ {
+    "Authorization": authorization,
+    "EgressAccessLogs": egress_access_logs
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediapackage/packaging_groups_list_only/index.md b/website/docs/services/mediapackage/packaging_groups_list_only/index.md
deleted file mode 100644
index dbeaefcc6..000000000
--- a/website/docs/services/mediapackage/packaging_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: packaging_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - packaging_groups_list_only
-  - mediapackage
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>packaging_groups</code> in a region or regions, for all properties use <a href="/services/mediapackage/packaging_groups/"><code>packaging_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>packaging_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaPackage::PackagingGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediapackage.packaging_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the PackagingGroup."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>packaging_groups</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.mediapackage.packaging_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>packaging_groups_list_only</code> resource, see <a href="/services/mediapackage/packaging_groups/#permissions"><code>packaging_groups</code></a>
-
diff --git a/website/docs/services/mediapackagev2/channel_groups/index.md b/website/docs/services/mediapackagev2/channel_groups/index.md
index 9042c35af..3b56e4b2d 100644
--- a/website/docs/services/mediapackagev2/channel_groups/index.md
+++ b/website/docs/services/mediapackagev2/channel_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>channel_group</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>channel_group</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "<p>The Amazon Resource Name (ARN) associated with the resource.</p>"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackagev2-channelgroup.html"><code>AWS::MediaPackageV2::ChannelGroup</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>channel_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ChannelGroupName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>channel_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>channel_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>channel_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>channel_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>channel_group</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.mediapackagev2.channel_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>channel_groups</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.mediapackagev2.channel_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -213,6 +267,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediapackagev2.channel_groups
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediapackagev2/channel_groups_list_only/index.md b/website/docs/services/mediapackagev2/channel_groups_list_only/index.md
deleted file mode 100644
index 6ffb1da3d..000000000
--- a/website/docs/services/mediapackagev2/channel_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: channel_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - channel_groups_list_only
-  - mediapackagev2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>channel_groups</code> in a region or regions, for all properties use <a href="/services/mediapackagev2/channel_groups/"><code>channel_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>channel_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td><p>Represents a channel group that facilitates the grouping of multiple channels.</p></td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediapackagev2.channel_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "<p>The Amazon Resource Name (ARN) associated with the resource.</p>"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>channel_groups</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.mediapackagev2.channel_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>channel_groups_list_only</code> resource, see <a href="/services/mediapackagev2/channel_groups/#permissions"><code>channel_groups</code></a>
-
diff --git a/website/docs/services/mediapackagev2/channel_policies/index.md b/website/docs/services/mediapackagev2/channel_policies/index.md
index db95ac7a5..0e143d59b 100644
--- a/website/docs/services/mediapackagev2/channel_policies/index.md
+++ b/website/docs/services/mediapackagev2/channel_policies/index.md
@@ -174,6 +174,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediapackagev2.channel_policies
+SET data__PatchDocument = string('{{ {
+    "Policy": policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ChannelGroupName>|<ChannelName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediapackagev2/channels/index.md b/website/docs/services/mediapackagev2/channels/index.md
index 9c4d33091..d419ea1dc 100644
--- a/website/docs/services/mediapackagev2/channels/index.md
+++ b/website/docs/services/mediapackagev2/channels/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>channel</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -143,6 +152,23 @@ Creates, updates, deletes or gets a <code>channel</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "<p>The Amazon Resource Name (ARN) associated with the resource.</p>"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackagev2-channel.html"><code>AWS::MediaPackageV2::Channel</code></a>.
 
@@ -152,31 +178,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ChannelGroupName, ChannelName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>channels_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -185,6 +217,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>channel</code>.
 ```sql
 SELECT
@@ -204,6 +245,19 @@ tags
 FROM awscc.mediapackagev2.channels
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>channels</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.mediapackagev2.channels_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -295,6 +349,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediapackagev2.channels
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "InputSwitchConfiguration": input_switch_configuration,
+    "OutputHeaderConfiguration": output_header_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediapackagev2/channels_list_only/index.md b/website/docs/services/mediapackagev2/channels_list_only/index.md
deleted file mode 100644
index cfd9c0fbc..000000000
--- a/website/docs/services/mediapackagev2/channels_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: channels_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - channels_list_only
-  - mediapackagev2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>channels</code> in a region or regions, for all properties use <a href="/services/mediapackagev2/channels/"><code>channels</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>channels_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td><p>Represents an entry point into AWS Elemental MediaPackage for an ABR video content stream sent from an upstream encoder such as AWS Elemental MediaLive. The channel continuously analyzes the content that it receives and prepares it to be distributed to consumers via one or more origin endpoints.</p></td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediapackagev2.channels_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "<p>The Amazon Resource Name (ARN) associated with the resource.</p>"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>channels</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.mediapackagev2.channels_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>channels_list_only</code> resource, see <a href="/services/mediapackagev2/channels/#permissions"><code>channels</code></a>
-
diff --git a/website/docs/services/mediapackagev2/index.md b/website/docs/services/mediapackagev2/index.md
index b0a88e446..c1fbe77d8 100644
--- a/website/docs/services/mediapackagev2/index.md
+++ b/website/docs/services/mediapackagev2/index.md
@@ -20,7 +20,7 @@ The mediapackagev2 service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>5</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,11 @@ The mediapackagev2 service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/mediapackagev2/channel_groups/">channel_groups</a><br />
-<a href="/services/mediapackagev2/channel_groups_list_only/">channel_groups_list_only</a><br />
 <a href="/services/mediapackagev2/channel_policies/">channel_policies</a><br />
 <a href="/services/mediapackagev2/channels/">channels</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/mediapackagev2/channels_list_only/">channels_list_only</a><br />
 <a href="/services/mediapackagev2/origin_endpoint_policies/">origin_endpoint_policies</a><br />
-<a href="/services/mediapackagev2/origin_endpoints/">origin_endpoints</a><br />
-<a href="/services/mediapackagev2/origin_endpoints_list_only/">origin_endpoints_list_only</a>
+<a href="/services/mediapackagev2/origin_endpoints/">origin_endpoints</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/mediapackagev2/origin_endpoint_policies/index.md b/website/docs/services/mediapackagev2/origin_endpoint_policies/index.md
index b903bb365..b4981d216 100644
--- a/website/docs/services/mediapackagev2/origin_endpoint_policies/index.md
+++ b/website/docs/services/mediapackagev2/origin_endpoint_policies/index.md
@@ -211,6 +211,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediapackagev2.origin_endpoint_policies
+SET data__PatchDocument = string('{{ {
+    "CdnAuthConfiguration": cdn_auth_configuration,
+    "Policy": policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ChannelGroupName>|<ChannelName>|<OriginEndpointName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediapackagev2/origin_endpoints/index.md b/website/docs/services/mediapackagev2/origin_endpoints/index.md
index 89108baa6..0a04c41d6 100644
--- a/website/docs/services/mediapackagev2/origin_endpoints/index.md
+++ b/website/docs/services/mediapackagev2/origin_endpoints/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>origin_endpoint</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -682,6 +691,23 @@ Creates, updates, deletes or gets an <code>origin_endpoint</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "<p>The Amazon Resource Name (ARN) associated with the resource.</p>"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackagev2-originendpoint.html"><code>AWS::MediaPackageV2::OriginEndpoint</code></a>.
 
@@ -691,31 +717,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>origin_endpoints</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ChannelGroupName, ChannelName, OriginEndpointName, ContainerType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>origin_endpoints</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>origin_endpoints</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>origin_endpoints_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>origin_endpoints</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -724,6 +756,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>origin_endpoint</code>.
 ```sql
 SELECT
@@ -749,6 +790,19 @@ tags
 FROM awscc.mediapackagev2.origin_endpoints
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>origin_endpoints</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.mediapackagev2.origin_endpoints_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -953,6 +1007,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediapackagev2.origin_endpoints
+SET data__PatchDocument = string('{{ {
+    "ContainerType": container_type,
+    "DashManifests": dash_manifests,
+    "Description": description,
+    "ForceEndpointErrorConfiguration": force_endpoint_error_configuration,
+    "Segment": segment,
+    "StartoverWindowSeconds": startover_window_seconds,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediapackagev2/origin_endpoints_list_only/index.md b/website/docs/services/mediapackagev2/origin_endpoints_list_only/index.md
deleted file mode 100644
index 2d53a4a5b..000000000
--- a/website/docs/services/mediapackagev2/origin_endpoints_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: origin_endpoints_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - origin_endpoints_list_only
-  - mediapackagev2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>origin_endpoints</code> in a region or regions, for all properties use <a href="/services/mediapackagev2/origin_endpoints/"><code>origin_endpoints</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>origin_endpoints_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td><p>Represents an origin endpoint that is associated with a channel, offering a dynamically repackaged version of its content through various streaming media protocols. The content can be efficiently disseminated to end-users via a Content Delivery Network (CDN), like Amazon CloudFront.</p></td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediapackagev2.origin_endpoints_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "<p>The Amazon Resource Name (ARN) associated with the resource.</p>"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>origin_endpoints</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.mediapackagev2.origin_endpoints_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>origin_endpoints_list_only</code> resource, see <a href="/services/mediapackagev2/origin_endpoints/#permissions"><code>origin_endpoints</code></a>
-
diff --git a/website/docs/services/mediatailor/channel_policies/index.md b/website/docs/services/mediatailor/channel_policies/index.md
index 25c8b5627..55d4f0db2 100644
--- a/website/docs/services/mediatailor/channel_policies/index.md
+++ b/website/docs/services/mediatailor/channel_policies/index.md
@@ -162,6 +162,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediatailor.channel_policies
+SET data__PatchDocument = string('{{ {
+    "Policy": policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ChannelName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediatailor/channels/index.md b/website/docs/services/mediatailor/channels/index.md
index f73f2e1ad..985762325 100644
--- a/website/docs/services/mediatailor/channels/index.md
+++ b/website/docs/services/mediatailor/channels/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>channel</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -184,6 +193,23 @@ Creates, updates, deletes or gets a <code>channel</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "channel_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediatailor-channel.html"><code>AWS::MediaTailor::Channel</code></a>.
 
@@ -193,31 +219,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ChannelName, Outputs, PlaybackMode, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>channels_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>channels</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -226,6 +258,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>channel</code>.
 ```sql
 SELECT
@@ -243,6 +284,19 @@ time_shift_configuration
 FROM awscc.mediatailor.channels
 WHERE region = 'us-east-1' AND data__Identifier = '<ChannelName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>channels</code> in a region.
+```sql
+SELECT
+region,
+channel_name
+FROM awscc.mediatailor.channels_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -358,6 +412,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediatailor.channels
+SET data__PatchDocument = string('{{ {
+    "Audiences": audiences,
+    "FillerSlate": filler_slate,
+    "LogConfiguration": log_configuration,
+    "Outputs": outputs,
+    "PlaybackMode": playback_mode,
+    "Tags": tags,
+    "TimeShiftConfiguration": time_shift_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ChannelName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediatailor/channels_list_only/index.md b/website/docs/services/mediatailor/channels_list_only/index.md
deleted file mode 100644
index 5c2a5972c..000000000
--- a/website/docs/services/mediatailor/channels_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: channels_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - channels_list_only
-  - mediatailor
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>channels</code> in a region or regions, for all properties use <a href="/services/mediatailor/channels/"><code>channels</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>channels_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::MediaTailor::Channel Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediatailor.channels_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "channel_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>channels</code> in a region.
-```sql
-SELECT
-region,
-channel_name
-FROM awscc.mediatailor.channels_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>channels_list_only</code> resource, see <a href="/services/mediatailor/channels/#permissions"><code>channels</code></a>
-
diff --git a/website/docs/services/mediatailor/index.md b/website/docs/services/mediatailor/index.md
index e30459c0a..dcf2524ae 100644
--- a/website/docs/services/mediatailor/index.md
+++ b/website/docs/services/mediatailor/index.md
@@ -20,7 +20,7 @@ The mediatailor service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>11</b></span><br />
+<span>total resources:&nbsp;<b>6</b></span><br />
 </div>
 </div>
 
@@ -31,16 +31,11 @@ The mediatailor service documentation.
 <div class="providerDocColumn">
 <a href="/services/mediatailor/channel_policies/">channel_policies</a><br />
 <a href="/services/mediatailor/channels/">channels</a><br />
-<a href="/services/mediatailor/channels_list_only/">channels_list_only</a><br />
-<a href="/services/mediatailor/live_sources/">live_sources</a><br />
-<a href="/services/mediatailor/live_sources_list_only/">live_sources_list_only</a><br />
-<a href="/services/mediatailor/playback_configurations/">playback_configurations</a>
+<a href="/services/mediatailor/live_sources/">live_sources</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/mediatailor/playback_configurations_list_only/">playback_configurations_list_only</a><br />
+<a href="/services/mediatailor/playback_configurations/">playback_configurations</a><br />
 <a href="/services/mediatailor/source_locations/">source_locations</a><br />
-<a href="/services/mediatailor/source_locations_list_only/">source_locations_list_only</a><br />
-<a href="/services/mediatailor/vod_sources/">vod_sources</a><br />
-<a href="/services/mediatailor/vod_sources_list_only/">vod_sources_list_only</a>
+<a href="/services/mediatailor/vod_sources/">vod_sources</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/mediatailor/live_sources/index.md b/website/docs/services/mediatailor/live_sources/index.md
index 7c19e115e..57bca7336 100644
--- a/website/docs/services/mediatailor/live_sources/index.md
+++ b/website/docs/services/mediatailor/live_sources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>live_source</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -94,6 +103,28 @@ Creates, updates, deletes or gets a <code>live_source</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "live_source_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "source_location_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediatailor-livesource.html"><code>AWS::MediaTailor::LiveSource</code></a>.
 
@@ -103,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>live_sources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="HttpPackageConfigurations, LiveSourceName, SourceLocationName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>live_sources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>live_sources</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>live_sources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>live_sources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>live_source</code>.
 ```sql
 SELECT
@@ -148,6 +194,20 @@ tags
 FROM awscc.mediatailor.live_sources
 WHERE region = 'us-east-1' AND data__Identifier = '<LiveSourceName>|<SourceLocationName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>live_sources</code> in a region.
+```sql
+SELECT
+region,
+live_source_name,
+source_location_name
+FROM awscc.mediatailor.live_sources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -229,6 +289,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediatailor.live_sources
+SET data__PatchDocument = string('{{ {
+    "HttpPackageConfigurations": http_package_configurations,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LiveSourceName>|<SourceLocationName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediatailor/live_sources_list_only/index.md b/website/docs/services/mediatailor/live_sources_list_only/index.md
deleted file mode 100644
index 38793855a..000000000
--- a/website/docs/services/mediatailor/live_sources_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: live_sources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - live_sources_list_only
-  - mediatailor
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>live_sources</code> in a region or regions, for all properties use <a href="/services/mediatailor/live_sources/"><code>live_sources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>live_sources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::MediaTailor::LiveSource Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediatailor.live_sources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "live_source_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "source_location_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>live_sources</code> in a region.
-```sql
-SELECT
-region,
-live_source_name,
-source_location_name
-FROM awscc.mediatailor.live_sources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>live_sources_list_only</code> resource, see <a href="/services/mediatailor/live_sources/#permissions"><code>live_sources</code></a>
-
diff --git a/website/docs/services/mediatailor/playback_configurations/index.md b/website/docs/services/mediatailor/playback_configurations/index.md
index a2f5f6944..ed9f7222f 100644
--- a/website/docs/services/mediatailor/playback_configurations/index.md
+++ b/website/docs/services/mediatailor/playback_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>playback_configuration</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ad_conditioning_configuration",
@@ -296,6 +305,23 @@ Creates, updates, deletes or gets a <code>playback_configuration</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The identifier for the playback configuration."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediatailor-playbackconfiguration.html"><code>AWS::MediaTailor::PlaybackConfiguration</code></a>.
 
@@ -305,31 +331,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>playback_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, VideoContentSourceUrl, AdDecisionServerUrl, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>playback_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>playback_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>playback_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>playback_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -338,6 +370,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>playback_configuration</code>.
 ```sql
 SELECT
@@ -366,6 +407,19 @@ video_content_source_url
 FROM awscc.mediatailor.playback_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>playback_configurations</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.mediatailor.playback_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -527,6 +581,33 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediatailor.playback_configurations
+SET data__PatchDocument = string('{{ {
+    "AdConditioningConfiguration": ad_conditioning_configuration,
+    "AdDecisionServerUrl": ad_decision_server_url,
+    "AvailSuppression": avail_suppression,
+    "Bumper": bumper,
+    "CdnConfiguration": cdn_configuration,
+    "ConfigurationAliases": configuration_aliases,
+    "InsertionMode": insertion_mode,
+    "LivePreRollConfiguration": live_pre_roll_configuration,
+    "ManifestProcessingRules": manifest_processing_rules,
+    "PersonalizationThresholdSeconds": personalization_threshold_seconds,
+    "LogConfiguration": log_configuration,
+    "SlateAdUrl": slate_ad_url,
+    "Tags": tags,
+    "TranscodeProfileName": transcode_profile_name,
+    "VideoContentSourceUrl": video_content_source_url
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediatailor/playback_configurations_list_only/index.md b/website/docs/services/mediatailor/playback_configurations_list_only/index.md
deleted file mode 100644
index 5008f9233..000000000
--- a/website/docs/services/mediatailor/playback_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: playback_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - playback_configurations_list_only
-  - mediatailor
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>playback_configurations</code> in a region or regions, for all properties use <a href="/services/mediatailor/playback_configurations/"><code>playback_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>playback_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MediaTailor::PlaybackConfiguration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediatailor.playback_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The identifier for the playback configuration."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>playback_configurations</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.mediatailor.playback_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>playback_configurations_list_only</code> resource, see <a href="/services/mediatailor/playback_configurations/#permissions"><code>playback_configurations</code></a>
-
diff --git a/website/docs/services/mediatailor/source_locations/index.md b/website/docs/services/mediatailor/source_locations/index.md
index 261a8fd63..5ef4f5e92 100644
--- a/website/docs/services/mediatailor/source_locations/index.md
+++ b/website/docs/services/mediatailor/source_locations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>source_location</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "access_configuration",
@@ -142,6 +151,23 @@ Creates, updates, deletes or gets a <code>source_location</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "source_location_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediatailor-sourcelocation.html"><code>AWS::MediaTailor::SourceLocation</code></a>.
 
@@ -151,31 +177,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>source_locations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="HttpConfiguration, SourceLocationName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>source_locations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>source_locations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>source_locations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>source_locations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -184,6 +216,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>source_location</code>.
 ```sql
 SELECT
@@ -198,6 +239,19 @@ tags
 FROM awscc.mediatailor.source_locations
 WHERE region = 'us-east-1' AND data__Identifier = '<SourceLocationName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>source_locations</code> in a region.
+```sql
+SELECT
+region,
+source_location_name
+FROM awscc.mediatailor.source_locations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -291,6 +345,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediatailor.source_locations
+SET data__PatchDocument = string('{{ {
+    "AccessConfiguration": access_configuration,
+    "DefaultSegmentDeliveryConfiguration": default_segment_delivery_configuration,
+    "HttpConfiguration": http_configuration,
+    "SegmentDeliveryConfigurations": segment_delivery_configurations,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SourceLocationName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediatailor/source_locations_list_only/index.md b/website/docs/services/mediatailor/source_locations_list_only/index.md
deleted file mode 100644
index 53f717de4..000000000
--- a/website/docs/services/mediatailor/source_locations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: source_locations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - source_locations_list_only
-  - mediatailor
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>source_locations</code> in a region or regions, for all properties use <a href="/services/mediatailor/source_locations/"><code>source_locations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>source_locations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::MediaTailor::SourceLocation Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediatailor.source_locations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "source_location_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>source_locations</code> in a region.
-```sql
-SELECT
-region,
-source_location_name
-FROM awscc.mediatailor.source_locations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>source_locations_list_only</code> resource, see <a href="/services/mediatailor/source_locations/#permissions"><code>source_locations</code></a>
-
diff --git a/website/docs/services/mediatailor/vod_sources/index.md b/website/docs/services/mediatailor/vod_sources/index.md
index 2e660808a..81d18fde2 100644
--- a/website/docs/services/mediatailor/vod_sources/index.md
+++ b/website/docs/services/mediatailor/vod_sources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vod_source</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -94,6 +103,28 @@ Creates, updates, deletes or gets a <code>vod_source</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "source_location_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "vod_source_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediatailor-vodsource.html"><code>AWS::MediaTailor::VodSource</code></a>.
 
@@ -103,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vod_sources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="HttpPackageConfigurations, SourceLocationName, VodSourceName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vod_sources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vod_sources</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vod_sources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vod_sources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vod_source</code>.
 ```sql
 SELECT
@@ -148,6 +194,20 @@ vod_source_name
 FROM awscc.mediatailor.vod_sources
 WHERE region = 'us-east-1' AND data__Identifier = '<SourceLocationName>|<VodSourceName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vod_sources</code> in a region.
+```sql
+SELECT
+region,
+source_location_name,
+vod_source_name
+FROM awscc.mediatailor.vod_sources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -229,6 +289,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mediatailor.vod_sources
+SET data__PatchDocument = string('{{ {
+    "HttpPackageConfigurations": http_package_configurations,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SourceLocationName>|<VodSourceName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mediatailor/vod_sources_list_only/index.md b/website/docs/services/mediatailor/vod_sources_list_only/index.md
deleted file mode 100644
index 53d35af81..000000000
--- a/website/docs/services/mediatailor/vod_sources_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: vod_sources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vod_sources_list_only
-  - mediatailor
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vod_sources</code> in a region or regions, for all properties use <a href="/services/mediatailor/vod_sources/"><code>vod_sources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vod_sources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::MediaTailor::VodSource Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mediatailor.vod_sources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "source_location_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "vod_source_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vod_sources</code> in a region.
-```sql
-SELECT
-region,
-source_location_name,
-vod_source_name
-FROM awscc.mediatailor.vod_sources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vod_sources_list_only</code> resource, see <a href="/services/mediatailor/vod_sources/#permissions"><code>vod_sources</code></a>
-
diff --git a/website/docs/services/memorydb/acls/index.md b/website/docs/services/memorydb/acls/index.md
index be89a6a24..1d7daf74c 100644
--- a/website/docs/services/memorydb/acls/index.md
+++ b/website/docs/services/memorydb/acls/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>acl</code> resource or lists <code>ac
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "status",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets an <code>acl</code> resource or lists <code>ac
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "acl_name",
+    "type": "string",
+    "description": "The name of the acl."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-acl.html"><code>AWS::MemoryDB::ACL</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>acls</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ACLName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>acls</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>acls</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>acls_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>acls</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>acl</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.memorydb.acls
 WHERE region = 'us-east-1' AND data__Identifier = '<ACLName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>acls</code> in a region.
+```sql
+SELECT
+region,
+acl_name
+FROM awscc.memorydb.acls_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -202,6 +256,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.memorydb.acls
+SET data__PatchDocument = string('{{ {
+    "UserNames": user_names,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ACLName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/memorydb/acls_list_only/index.md b/website/docs/services/memorydb/acls_list_only/index.md
deleted file mode 100644
index 80042867a..000000000
--- a/website/docs/services/memorydb/acls_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: acls_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - acls_list_only
-  - memorydb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>acls</code> in a region or regions, for all properties use <a href="/services/memorydb/acls/"><code>acls</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>acls_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::MemoryDB::ACL</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.memorydb.acls_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "acl_name",
-    "type": "string",
-    "description": "The name of the acl."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>acls</code> in a region.
-```sql
-SELECT
-region,
-acl_name
-FROM awscc.memorydb.acls_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>acls_list_only</code> resource, see <a href="/services/memorydb/acls/#permissions"><code>acls</code></a>
-
diff --git a/website/docs/services/memorydb/clusters/index.md b/website/docs/services/memorydb/clusters/index.md
index 735e2dbe5..396d903c8 100644
--- a/website/docs/services/memorydb/clusters/index.md
+++ b/website/docs/services/memorydb/clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cluster_name",
@@ -224,6 +233,23 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_name",
+    "type": "string",
+    "description": "The name of the cluster. This value must be unique as it also serves as the cluster identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html"><code>AWS::MemoryDB::Cluster</code></a>.
 
@@ -233,31 +259,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ClusterName, NodeType, ACLName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -266,6 +298,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cluster</code>.
 ```sql
 SELECT
@@ -305,6 +346,19 @@ tags
 FROM awscc.memorydb.clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<ClusterName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>clusters</code> in a region.
+```sql
+SELECT
+region,
+cluster_name
+FROM awscc.memorydb.clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -487,6 +541,36 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.memorydb.clusters
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "NodeType": node_type,
+    "NumShards": num_shards,
+    "NumReplicasPerShard": num_replicas_per_shard,
+    "SecurityGroupIds": security_group_ids,
+    "MaintenanceWindow": maintenance_window,
+    "ParameterGroupName": parameter_group_name,
+    "SnapshotRetentionLimit": snapshot_retention_limit,
+    "SnapshotWindow": snapshot_window,
+    "ACLName": acl_name,
+    "SnsTopicArn": sns_topic_arn,
+    "SnsTopicStatus": sns_topic_status,
+    "IpDiscovery": ip_discovery,
+    "FinalSnapshotName": final_snapshot_name,
+    "Engine": engine,
+    "EngineVersion": engine_version,
+    "AutoMinorVersionUpgrade": auto_minor_version_upgrade,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ClusterName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/memorydb/clusters_list_only/index.md b/website/docs/services/memorydb/clusters_list_only/index.md
deleted file mode 100644
index 0741fb684..000000000
--- a/website/docs/services/memorydb/clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - clusters_list_only
-  - memorydb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>clusters</code> in a region or regions, for all properties use <a href="/services/memorydb/clusters/"><code>clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::MemoryDB::Cluster resource creates an Amazon MemoryDB Cluster.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.memorydb.clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cluster_name",
-    "type": "string",
-    "description": "The name of the cluster. This value must be unique as it also serves as the cluster identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>clusters</code> in a region.
-```sql
-SELECT
-region,
-cluster_name
-FROM awscc.memorydb.clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>clusters_list_only</code> resource, see <a href="/services/memorydb/clusters/#permissions"><code>clusters</code></a>
-
diff --git a/website/docs/services/memorydb/index.md b/website/docs/services/memorydb/index.md
index 75dfec115..39a715902 100644
--- a/website/docs/services/memorydb/index.md
+++ b/website/docs/services/memorydb/index.md
@@ -20,7 +20,7 @@ The memorydb service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>12</b></span><br />
+<span>total resources:&nbsp;<b>6</b></span><br />
 </div>
 </div>
 
@@ -30,18 +30,12 @@ The memorydb service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/memorydb/acls/">acls</a><br />
-<a href="/services/memorydb/acls_list_only/">acls_list_only</a><br />
 <a href="/services/memorydb/clusters/">clusters</a><br />
-<a href="/services/memorydb/clusters_list_only/">clusters_list_only</a><br />
-<a href="/services/memorydb/multi_region_clusters/">multi_region_clusters</a><br />
-<a href="/services/memorydb/multi_region_clusters_list_only/">multi_region_clusters_list_only</a>
+<a href="/services/memorydb/multi_region_clusters/">multi_region_clusters</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/memorydb/parameter_groups/">parameter_groups</a><br />
-<a href="/services/memorydb/parameter_groups_list_only/">parameter_groups_list_only</a><br />
 <a href="/services/memorydb/subnet_groups/">subnet_groups</a><br />
-<a href="/services/memorydb/subnet_groups_list_only/">subnet_groups_list_only</a><br />
-<a href="/services/memorydb/users/">users</a><br />
-<a href="/services/memorydb/users_list_only/">users_list_only</a>
+<a href="/services/memorydb/users/">users</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/memorydb/multi_region_clusters/index.md b/website/docs/services/memorydb/multi_region_clusters/index.md
index 52b908271..f27ea1ac3 100644
--- a/website/docs/services/memorydb/multi_region_clusters/index.md
+++ b/website/docs/services/memorydb/multi_region_clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>multi_region_cluster</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "multi_region_cluster_name_suffix",
@@ -117,6 +126,23 @@ Creates, updates, deletes or gets a <code>multi_region_cluster</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "multi_region_cluster_name",
+    "type": "string",
+    "description": "The name of the Global Datastore, it is generated by MemoryDB adding a prefix to MultiRegionClusterNameSuffix."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-multiregioncluster.html"><code>AWS::MemoryDB::MultiRegionCluster</code></a>.
 
@@ -126,31 +152,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>multi_region_clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="NodeType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>multi_region_clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>multi_region_clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>multi_region_clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>multi_region_clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -159,6 +191,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>multi_region_cluster</code>.
 ```sql
 SELECT
@@ -179,6 +220,19 @@ update_strategy
 FROM awscc.memorydb.multi_region_clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<MultiRegionClusterName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>multi_region_clusters</code> in a region.
+```sql
+SELECT
+region,
+multi_region_cluster_name
+FROM awscc.memorydb.multi_region_clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -277,6 +331,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.memorydb.multi_region_clusters
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "NodeType": node_type,
+    "NumShards": num_shards,
+    "Engine": engine,
+    "Tags": tags,
+    "UpdateStrategy": update_strategy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<MultiRegionClusterName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/memorydb/multi_region_clusters_list_only/index.md b/website/docs/services/memorydb/multi_region_clusters_list_only/index.md
deleted file mode 100644
index 3b1e35950..000000000
--- a/website/docs/services/memorydb/multi_region_clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: multi_region_clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - multi_region_clusters_list_only
-  - memorydb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>multi_region_clusters</code> in a region or regions, for all properties use <a href="/services/memorydb/multi_region_clusters/"><code>multi_region_clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>multi_region_clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::MemoryDB::Multi Region Cluster resource creates an Amazon MemoryDB Multi Region Cluster.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.memorydb.multi_region_clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "multi_region_cluster_name",
-    "type": "string",
-    "description": "The name of the Global Datastore, it is generated by MemoryDB adding a prefix to MultiRegionClusterNameSuffix."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>multi_region_clusters</code> in a region.
-```sql
-SELECT
-region,
-multi_region_cluster_name
-FROM awscc.memorydb.multi_region_clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>multi_region_clusters_list_only</code> resource, see <a href="/services/memorydb/multi_region_clusters/#permissions"><code>multi_region_clusters</code></a>
-
diff --git a/website/docs/services/memorydb/parameter_groups/index.md b/website/docs/services/memorydb/parameter_groups/index.md
index 817452623..6bce0ebca 100644
--- a/website/docs/services/memorydb/parameter_groups/index.md
+++ b/website/docs/services/memorydb/parameter_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>parameter_group</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "parameter_group_name",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>parameter_group</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "parameter_group_name",
+    "type": "string",
+    "description": "The name of the parameter group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-parametergroup.html"><code>AWS::MemoryDB::ParameterGroup</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>parameter_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ParameterGroupName, Family, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>parameter_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>parameter_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>parameter_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>parameter_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>parameter_group</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ arn
 FROM awscc.memorydb.parameter_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<ParameterGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>parameter_groups</code> in a region.
+```sql
+SELECT
+region,
+parameter_group_name
+FROM awscc.memorydb.parameter_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +271,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.memorydb.parameter_groups
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Parameters": parameters
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ParameterGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/memorydb/parameter_groups_list_only/index.md b/website/docs/services/memorydb/parameter_groups_list_only/index.md
deleted file mode 100644
index 6d81f006d..000000000
--- a/website/docs/services/memorydb/parameter_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: parameter_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - parameter_groups_list_only
-  - memorydb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>parameter_groups</code> in a region or regions, for all properties use <a href="/services/memorydb/parameter_groups/"><code>parameter_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>parameter_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::MemoryDB::ParameterGroup resource creates an Amazon MemoryDB ParameterGroup.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.memorydb.parameter_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "parameter_group_name",
-    "type": "string",
-    "description": "The name of the parameter group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>parameter_groups</code> in a region.
-```sql
-SELECT
-region,
-parameter_group_name
-FROM awscc.memorydb.parameter_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>parameter_groups_list_only</code> resource, see <a href="/services/memorydb/parameter_groups/#permissions"><code>parameter_groups</code></a>
-
diff --git a/website/docs/services/memorydb/subnet_groups/index.md b/website/docs/services/memorydb/subnet_groups/index.md
index 4a794be44..18bd4c1fb 100644
--- a/website/docs/services/memorydb/subnet_groups/index.md
+++ b/website/docs/services/memorydb/subnet_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>subnet_group</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "subnet_group_name",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>subnet_group</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "subnet_group_name",
+    "type": "string",
+    "description": "The name of the subnet group. This value must be unique as it also serves as the subnet group identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-subnetgroup.html"><code>AWS::MemoryDB::SubnetGroup</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>subnet_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SubnetGroupName, SubnetIds, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>subnet_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>subnet_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>subnet_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>subnet_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>subnet_group</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ supported_network_types
 FROM awscc.memorydb.subnet_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<SubnetGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>subnet_groups</code> in a region.
+```sql
+SELECT
+region,
+subnet_group_name
+FROM awscc.memorydb.subnet_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -214,6 +268,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.memorydb.subnet_groups
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "SubnetIds": subnet_ids,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SubnetGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/memorydb/subnet_groups_list_only/index.md b/website/docs/services/memorydb/subnet_groups_list_only/index.md
deleted file mode 100644
index d64e68384..000000000
--- a/website/docs/services/memorydb/subnet_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: subnet_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - subnet_groups_list_only
-  - memorydb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>subnet_groups</code> in a region or regions, for all properties use <a href="/services/memorydb/subnet_groups/"><code>subnet_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>subnet_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::MemoryDB::SubnetGroup resource creates an Amazon MemoryDB Subnet Group.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.memorydb.subnet_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "subnet_group_name",
-    "type": "string",
-    "description": "The name of the subnet group. This value must be unique as it also serves as the subnet group identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>subnet_groups</code> in a region.
-```sql
-SELECT
-region,
-subnet_group_name
-FROM awscc.memorydb.subnet_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>subnet_groups_list_only</code> resource, see <a href="/services/memorydb/subnet_groups/#permissions"><code>subnet_groups</code></a>
-
diff --git a/website/docs/services/memorydb/users/index.md b/website/docs/services/memorydb/users/index.md
index 81af94b05..8c4a7413f 100644
--- a/website/docs/services/memorydb/users/index.md
+++ b/website/docs/services/memorydb/users/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>user</code> resource or lists <code>us
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "status",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets a <code>user</code> resource or lists <code>us
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "user_name",
+    "type": "string",
+    "description": "The name of the user."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-user.html"><code>AWS::MemoryDB::User</code></a>.
 
@@ -103,31 +129,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>users</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="UserName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>users</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>users</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>users_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>users</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.memorydb.users
 WHERE region = 'us-east-1' AND data__Identifier = '<UserName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>users</code> in a region.
+```sql
+SELECT
+region,
+user_name
+FROM awscc.memorydb.users_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -226,6 +280,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.memorydb.users
+SET data__PatchDocument = string('{{ {
+    "AccessString": access_string,
+    "AuthenticationMode": authentication_mode,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/memorydb/users_list_only/index.md b/website/docs/services/memorydb/users_list_only/index.md
deleted file mode 100644
index 4f1e1ac5a..000000000
--- a/website/docs/services/memorydb/users_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: users_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - users_list_only
-  - memorydb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>users</code> in a region or regions, for all properties use <a href="/services/memorydb/users/"><code>users</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>users_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::MemoryDB::User</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.memorydb.users_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "user_name",
-    "type": "string",
-    "description": "The name of the user."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>users</code> in a region.
-```sql
-SELECT
-region,
-user_name
-FROM awscc.memorydb.users_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>users_list_only</code> resource, see <a href="/services/memorydb/users/#permissions"><code>users</code></a>
-
diff --git a/website/docs/services/mpa/approval_teams/index.md b/website/docs/services/mpa/approval_teams/index.md
index 97d38349c..80fd67db5 100644
--- a/website/docs/services/mpa/approval_teams/index.md
+++ b/website/docs/services/mpa/approval_teams/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>approval_team</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "approval_strategy",
@@ -170,6 +179,23 @@ Creates, updates, deletes or gets an <code>approval_team</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mpa-approvalteam.html"><code>AWS::MPA::ApprovalTeam</code></a>.
 
@@ -179,31 +205,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>approval_teams</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApprovalStrategy, Approvers, Policies, Name, Description, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>approval_teams</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>approval_teams</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>approval_teams_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>approval_teams</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -212,6 +244,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>approval_team</code>.
 ```sql
 SELECT
@@ -234,6 +275,19 @@ status_message
 FROM awscc.mpa.approval_teams
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>approval_teams</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.mpa.approval_teams_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -332,6 +386,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mpa.approval_teams
+SET data__PatchDocument = string('{{ {
+    "ApprovalStrategy": approval_strategy,
+    "Tags": tags,
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mpa/approval_teams_list_only/index.md b/website/docs/services/mpa/approval_teams_list_only/index.md
deleted file mode 100644
index 0ff139e0c..000000000
--- a/website/docs/services/mpa/approval_teams_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: approval_teams_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - approval_teams_list_only
-  - mpa
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>approval_teams</code> in a region or regions, for all properties use <a href="/services/mpa/approval_teams/"><code>approval_teams</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>approval_teams_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::MPA::ApprovalTeam.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mpa.approval_teams_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>approval_teams</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.mpa.approval_teams_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>approval_teams_list_only</code> resource, see <a href="/services/mpa/approval_teams/#permissions"><code>approval_teams</code></a>
-
diff --git a/website/docs/services/mpa/identity_sources/index.md b/website/docs/services/mpa/identity_sources/index.md
index 9394979da..b2b4b8a66 100644
--- a/website/docs/services/mpa/identity_sources/index.md
+++ b/website/docs/services/mpa/identity_sources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>identity_source</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "identity_source_arn",
@@ -116,6 +125,23 @@ Creates, updates, deletes or gets an <code>identity_source</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "identity_source_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mpa-identitysource.html"><code>AWS::MPA::IdentitySource</code></a>.
 
@@ -125,31 +151,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>identity_sources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IdentitySourceParameters, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>identity_sources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>identity_sources</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>identity_sources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>identity_sources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -158,6 +190,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>identity_source</code>.
 ```sql
 SELECT
@@ -173,6 +214,19 @@ status_message
 FROM awscc.mpa.identity_sources
 WHERE region = 'us-east-1' AND data__Identifier = '<IdentitySourceArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>identity_sources</code> in a region.
+```sql
+SELECT
+region,
+identity_source_arn
+FROM awscc.mpa.identity_sources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -243,6 +297,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mpa.identity_sources
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IdentitySourceArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mpa/identity_sources_list_only/index.md b/website/docs/services/mpa/identity_sources_list_only/index.md
deleted file mode 100644
index f8e44b7c4..000000000
--- a/website/docs/services/mpa/identity_sources_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: identity_sources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - identity_sources_list_only
-  - mpa
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>identity_sources</code> in a region or regions, for all properties use <a href="/services/mpa/identity_sources/"><code>identity_sources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>identity_sources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::MPA::IdentitySource.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mpa.identity_sources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "identity_source_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>identity_sources</code> in a region.
-```sql
-SELECT
-region,
-identity_source_arn
-FROM awscc.mpa.identity_sources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>identity_sources_list_only</code> resource, see <a href="/services/mpa/identity_sources/#permissions"><code>identity_sources</code></a>
-
diff --git a/website/docs/services/mpa/index.md b/website/docs/services/mpa/index.md
index cdc39805c..5d1440afd 100644
--- a/website/docs/services/mpa/index.md
+++ b/website/docs/services/mpa/index.md
@@ -20,7 +20,7 @@ The mpa service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The mpa service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/mpa/approval_teams/">approval_teams</a><br />
-<a href="/services/mpa/approval_teams_list_only/">approval_teams_list_only</a>
+<a href="/services/mpa/approval_teams/">approval_teams</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/mpa/identity_sources/">identity_sources</a><br />
-<a href="/services/mpa/identity_sources_list_only/">identity_sources_list_only</a>
+<a href="/services/mpa/identity_sources/">identity_sources</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/msk/batch_scram_secrets/index.md b/website/docs/services/msk/batch_scram_secrets/index.md
index bcc5ec91e..314c72374 100644
--- a/website/docs/services/msk/batch_scram_secrets/index.md
+++ b/website/docs/services/msk/batch_scram_secrets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>batch_scram_secret</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cluster_arn",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>batch_scram_secret</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-batchscramsecret.html"><code>AWS::MSK::BatchScramSecret</code></a>.
 
@@ -59,31 +85,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>batch_scram_secrets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ClusterArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>batch_scram_secrets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>batch_scram_secrets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>batch_scram_secrets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>batch_scram_secrets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +124,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>batch_scram_secret</code>.
 ```sql
 SELECT
@@ -101,6 +142,19 @@ secret_arn_list
 FROM awscc.msk.batch_scram_secrets
 WHERE region = 'us-east-1' AND data__Identifier = '<ClusterArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>batch_scram_secrets</code> in a region.
+```sql
+SELECT
+region,
+cluster_arn
+FROM awscc.msk.batch_scram_secrets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -166,6 +220,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.msk.batch_scram_secrets
+SET data__PatchDocument = string('{{ {
+    "SecretArnList": secret_arn_list
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ClusterArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/msk/batch_scram_secrets_list_only/index.md b/website/docs/services/msk/batch_scram_secrets_list_only/index.md
deleted file mode 100644
index 93008d2a6..000000000
--- a/website/docs/services/msk/batch_scram_secrets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: batch_scram_secrets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - batch_scram_secrets_list_only
-  - msk
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>batch_scram_secrets</code> in a region or regions, for all properties use <a href="/services/msk/batch_scram_secrets/"><code>batch_scram_secrets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>batch_scram_secrets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::MSK::BatchScramSecret</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.msk.batch_scram_secrets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cluster_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>batch_scram_secrets</code> in a region.
-```sql
-SELECT
-region,
-cluster_arn
-FROM awscc.msk.batch_scram_secrets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>batch_scram_secrets_list_only</code> resource, see <a href="/services/msk/batch_scram_secrets/#permissions"><code>batch_scram_secrets</code></a>
-
diff --git a/website/docs/services/msk/cluster_policies/index.md b/website/docs/services/msk/cluster_policies/index.md
index a142e5583..dc52703d6 100644
--- a/website/docs/services/msk/cluster_policies/index.md
+++ b/website/docs/services/msk/cluster_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cluster_policy</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "policy",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets a <code>cluster_policy</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_arn",
+    "type": "string",
+    "description": "The arn of the cluster for the resource policy."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-clusterpolicy.html"><code>AWS::MSK::ClusterPolicy</code></a>.
 
@@ -64,31 +90,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cluster_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Policy, ClusterArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cluster_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cluster_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cluster_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cluster_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +129,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cluster_policy</code>.
 ```sql
 SELECT
@@ -107,6 +148,19 @@ current_version
 FROM awscc.msk.cluster_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<ClusterArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cluster_policies</code> in a region.
+```sql
+SELECT
+region,
+cluster_arn
+FROM awscc.msk.cluster_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -173,6 +227,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.msk.cluster_policies
+SET data__PatchDocument = string('{{ {
+    "Policy": policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ClusterArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/msk/cluster_policies_list_only/index.md b/website/docs/services/msk/cluster_policies_list_only/index.md
deleted file mode 100644
index 245af6ad5..000000000
--- a/website/docs/services/msk/cluster_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: cluster_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cluster_policies_list_only
-  - msk
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cluster_policies</code> in a region or regions, for all properties use <a href="/services/msk/cluster_policies/"><code>cluster_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cluster_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::MSK::ClusterPolicy</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.msk.cluster_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cluster_arn",
-    "type": "string",
-    "description": "The arn of the cluster for the resource policy."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cluster_policies</code> in a region.
-```sql
-SELECT
-region,
-cluster_arn
-FROM awscc.msk.cluster_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cluster_policies_list_only</code> resource, see <a href="/services/msk/cluster_policies/#permissions"><code>cluster_policies</code></a>
-
diff --git a/website/docs/services/msk/clusters/index.md b/website/docs/services/msk/clusters/index.md
index 029736e1a..19780fdda 100644
--- a/website/docs/services/msk/clusters/index.md
+++ b/website/docs/services/msk/clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "broker_node_group_info",
@@ -349,6 +358,23 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-cluster.html"><code>AWS::MSK::Cluster</code></a>.
 
@@ -358,31 +384,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="BrokerNodeGroupInfo, KafkaVersion, NumberOfBrokerNodes, ClusterName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -391,6 +423,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cluster</code>.
 ```sql
 SELECT
@@ -412,6 +453,19 @@ storage_mode
 FROM awscc.msk.clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>clusters</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.msk.clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -576,6 +630,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.msk.clusters
+SET data__PatchDocument = string('{{ {
+    "EnhancedMonitoring": enhanced_monitoring,
+    "KafkaVersion": kafka_version,
+    "NumberOfBrokerNodes": number_of_broker_nodes,
+    "OpenMonitoring": open_monitoring,
+    "CurrentVersion": current_version,
+    "ClientAuthentication": client_authentication,
+    "LoggingInfo": logging_info,
+    "Tags": tags,
+    "ConfigurationInfo": configuration_info,
+    "StorageMode": storage_mode
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/msk/clusters_list_only/index.md b/website/docs/services/msk/clusters_list_only/index.md
deleted file mode 100644
index c1ef43f3a..000000000
--- a/website/docs/services/msk/clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - clusters_list_only
-  - msk
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>clusters</code> in a region or regions, for all properties use <a href="/services/msk/clusters/"><code>clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::MSK::Cluster</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.msk.clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>clusters</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.msk.clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>clusters_list_only</code> resource, see <a href="/services/msk/clusters/#permissions"><code>clusters</code></a>
-
diff --git a/website/docs/services/msk/configurations/index.md b/website/docs/services/msk/configurations/index.md
index eebf74812..3a4d02f64 100644
--- a/website/docs/services/msk/configurations/index.md
+++ b/website/docs/services/msk/configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>configuration</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>configuration</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-configuration.html"><code>AWS::MSK::Configuration</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ServerProperties, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>configuration</code>.
 ```sql
 SELECT
@@ -142,6 +183,19 @@ latest_revision
 FROM awscc.msk.configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>configurations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.msk.configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -224,6 +278,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.msk.configurations
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "ServerProperties": server_properties
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/msk/configurations_list_only/index.md b/website/docs/services/msk/configurations_list_only/index.md
deleted file mode 100644
index 33e54e3c0..000000000
--- a/website/docs/services/msk/configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - configurations_list_only
-  - msk
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>configurations</code> in a region or regions, for all properties use <a href="/services/msk/configurations/"><code>configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::MSK::Configuration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.msk.configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>configurations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.msk.configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>configurations_list_only</code> resource, see <a href="/services/msk/configurations/#permissions"><code>configurations</code></a>
-
diff --git a/website/docs/services/msk/index.md b/website/docs/services/msk/index.md
index 5de1ad70e..d3bd56f21 100644
--- a/website/docs/services/msk/index.md
+++ b/website/docs/services/msk/index.md
@@ -20,7 +20,7 @@ The msk service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>14</b></span><br />
+<span>total resources:&nbsp;<b>7</b></span><br />
 </div>
 </div>
 
@@ -30,20 +30,13 @@ The msk service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/msk/batch_scram_secrets/">batch_scram_secrets</a><br />
-<a href="/services/msk/batch_scram_secrets_list_only/">batch_scram_secrets_list_only</a><br />
 <a href="/services/msk/cluster_policies/">cluster_policies</a><br />
-<a href="/services/msk/cluster_policies_list_only/">cluster_policies_list_only</a><br />
 <a href="/services/msk/clusters/">clusters</a><br />
-<a href="/services/msk/clusters_list_only/">clusters_list_only</a><br />
 <a href="/services/msk/configurations/">configurations</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/msk/configurations_list_only/">configurations_list_only</a><br />
 <a href="/services/msk/replicators/">replicators</a><br />
-<a href="/services/msk/replicators_list_only/">replicators_list_only</a><br />
 <a href="/services/msk/serverless_clusters/">serverless_clusters</a><br />
-<a href="/services/msk/serverless_clusters_list_only/">serverless_clusters_list_only</a><br />
-<a href="/services/msk/vpc_connections/">vpc_connections</a><br />
-<a href="/services/msk/vpc_connections_list_only/">vpc_connections_list_only</a>
+<a href="/services/msk/vpc_connections/">vpc_connections</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/msk/replicators/index.md b/website/docs/services/msk/replicators/index.md
index 19bb890bb..2865c6083 100644
--- a/website/docs/services/msk/replicators/index.md
+++ b/website/docs/services/msk/replicators/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>replicator</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "replicator_arn",
@@ -223,6 +232,23 @@ Creates, updates, deletes or gets a <code>replicator</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "replicator_arn",
+    "type": "string",
+    "description": "Amazon Resource Name for the created replicator."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-replicator.html"><code>AWS::MSK::Replicator</code></a>.
 
@@ -232,31 +258,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>replicators</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ReplicatorName, ReplicationInfoList, KafkaClusters, ServiceExecutionRoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>replicators</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>replicators</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>replicators_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>replicators</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -265,6 +297,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>replicator</code>.
 ```sql
 SELECT
@@ -280,6 +321,19 @@ tags
 FROM awscc.msk.replicators
 WHERE region = 'us-east-1' AND data__Identifier = '<ReplicatorArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>replicators</code> in a region.
+```sql
+SELECT
+region,
+replicator_arn
+FROM awscc.msk.replicators_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -397,6 +451,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.msk.replicators
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ReplicatorArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/msk/replicators_list_only/index.md b/website/docs/services/msk/replicators_list_only/index.md
deleted file mode 100644
index 50f8ed181..000000000
--- a/website/docs/services/msk/replicators_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: replicators_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - replicators_list_only
-  - msk
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>replicators</code> in a region or regions, for all properties use <a href="/services/msk/replicators/"><code>replicators</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>replicators_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::MSK::Replicator</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.msk.replicators_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "replicator_arn",
-    "type": "string",
-    "description": "Amazon Resource Name for the created replicator."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>replicators</code> in a region.
-```sql
-SELECT
-region,
-replicator_arn
-FROM awscc.msk.replicators_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>replicators_list_only</code> resource, see <a href="/services/msk/replicators/#permissions"><code>replicators</code></a>
-
diff --git a/website/docs/services/msk/serverless_clusters/index.md b/website/docs/services/msk/serverless_clusters/index.md
index 72e3d60f8..241f85653 100644
--- a/website/docs/services/msk/serverless_clusters/index.md
+++ b/website/docs/services/msk/serverless_clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>serverless_cluster</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -98,6 +107,23 @@ Creates, updates, deletes or gets a <code>serverless_cluster</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-serverlesscluster.html"><code>AWS::MSK::ServerlessCluster</code></a>.
 
@@ -107,26 +133,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>serverless_clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ClusterName, VpcConfigs, ClientAuthentication, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>serverless_clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>serverless_clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>serverless_clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -135,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>serverless_cluster</code>.
 ```sql
 SELECT
@@ -147,6 +187,19 @@ tags
 FROM awscc.msk.serverless_clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>serverless_clusters</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.msk.serverless_clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -230,6 +283,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/msk/serverless_clusters_list_only/index.md b/website/docs/services/msk/serverless_clusters_list_only/index.md
deleted file mode 100644
index ef6b5f148..000000000
--- a/website/docs/services/msk/serverless_clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: serverless_clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - serverless_clusters_list_only
-  - msk
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>serverless_clusters</code> in a region or regions, for all properties use <a href="/services/msk/serverless_clusters/"><code>serverless_clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>serverless_clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::MSK::ServerlessCluster</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.msk.serverless_clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>serverless_clusters</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.msk.serverless_clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>serverless_clusters_list_only</code> resource, see <a href="/services/msk/serverless_clusters/#permissions"><code>serverless_clusters</code></a>
-
diff --git a/website/docs/services/msk/vpc_connections/index.md b/website/docs/services/msk/vpc_connections/index.md
index 808797067..806b29978 100644
--- a/website/docs/services/msk/vpc_connections/index.md
+++ b/website/docs/services/msk/vpc_connections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_connection</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -75,6 +84,23 @@ Creates, updates, deletes or gets a <code>vpc_connection</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-vpcconnection.html"><code>AWS::MSK::VpcConnection</code></a>.
 
@@ -84,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_connections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Authentication, ClientSubnets, SecurityGroups, TargetClusterArn, VpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_connections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_connections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_connections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_connections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_connection</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ vpc_id
 FROM awscc.msk.vpc_connections
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_connections</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.msk.vpc_connections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -221,6 +275,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.msk.vpc_connections
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/msk/vpc_connections_list_only/index.md b/website/docs/services/msk/vpc_connections_list_only/index.md
deleted file mode 100644
index 899878147..000000000
--- a/website/docs/services/msk/vpc_connections_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpc_connections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_connections_list_only
-  - msk
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_connections</code> in a region or regions, for all properties use <a href="/services/msk/vpc_connections/"><code>vpc_connections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_connections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::MSK::VpcConnection</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.msk.vpc_connections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_connections</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.msk.vpc_connections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_connections_list_only</code> resource, see <a href="/services/msk/vpc_connections/#permissions"><code>vpc_connections</code></a>
-
diff --git a/website/docs/services/mwaa/environments/index.md b/website/docs/services/mwaa/environments/index.md
index 441561948..011eecfa6 100644
--- a/website/docs/services/mwaa/environments/index.md
+++ b/website/docs/services/mwaa/environments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -206,6 +215,23 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Customer-defined identifier for the environment, unique per customer region."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html"><code>AWS::MWAA::Environment</code></a>.
 
@@ -215,31 +241,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>environments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -248,6 +280,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>environment</code>.
 ```sql
 SELECT
@@ -286,6 +327,19 @@ worker_replacement_strategy
 FROM awscc.mwaa.environments
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>environments</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.mwaa.environments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -458,6 +512,39 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.mwaa.environments
+SET data__PatchDocument = string('{{ {
+    "ExecutionRoleArn": execution_role_arn,
+    "AirflowVersion": airflow_version,
+    "SourceBucketArn": source_bucket_arn,
+    "DagS3Path": dag_s3_path,
+    "PluginsS3Path": plugins_s3_path,
+    "PluginsS3ObjectVersion": plugins_s3_object_version,
+    "RequirementsS3Path": requirements_s3_path,
+    "RequirementsS3ObjectVersion": requirements_s3_object_version,
+    "StartupScriptS3Path": startup_script_s3_path,
+    "StartupScriptS3ObjectVersion": startup_script_s3_object_version,
+    "AirflowConfigurationOptions": airflow_configuration_options,
+    "EnvironmentClass": environment_class,
+    "MaxWorkers": max_workers,
+    "MinWorkers": min_workers,
+    "MaxWebservers": max_webservers,
+    "MinWebservers": min_webservers,
+    "Schedulers": schedulers,
+    "WeeklyMaintenanceWindowStart": weekly_maintenance_window_start,
+    "Tags": tags,
+    "WebserverAccessMode": webserver_access_mode,
+    "WorkerReplacementStrategy": worker_replacement_strategy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/mwaa/environments_list_only/index.md b/website/docs/services/mwaa/environments_list_only/index.md
deleted file mode 100644
index 698c22e6d..000000000
--- a/website/docs/services/mwaa/environments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: environments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - environments_list_only
-  - mwaa
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>environments</code> in a region or regions, for all properties use <a href="/services/mwaa/environments/"><code>environments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>environments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::MWAA::Environment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.mwaa.environments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Customer-defined identifier for the environment, unique per customer region."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>environments</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.mwaa.environments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>environments_list_only</code> resource, see <a href="/services/mwaa/environments/#permissions"><code>environments</code></a>
-
diff --git a/website/docs/services/mwaa/index.md b/website/docs/services/mwaa/index.md
index 744829f49..80bd3cbb0 100644
--- a/website/docs/services/mwaa/index.md
+++ b/website/docs/services/mwaa/index.md
@@ -20,7 +20,7 @@ The mwaa service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The mwaa service documentation.
 <a href="/services/mwaa/environments/">environments</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/mwaa/environments_list_only/">environments_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/neptune/db_cluster_parameter_groups/index.md b/website/docs/services/neptune/db_cluster_parameter_groups/index.md
index 6e01ea0e5..cbaae5387 100644
--- a/website/docs/services/neptune/db_cluster_parameter_groups/index.md
+++ b/website/docs/services/neptune/db_cluster_parameter_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>db_cluster_parameter_group</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>db_cluster_parameter_group</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Provides the name of the DB cluster parameter group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbclusterparametergroup.html"><code>AWS::Neptune::DBClusterParameterGroup</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>db_cluster_parameter_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Description, Family, Parameters, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>db_cluster_parameter_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>db_cluster_parameter_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>db_cluster_parameter_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>db_cluster_parameter_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>db_cluster_parameter_group</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.neptune.db_cluster_parameter_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>db_cluster_parameter_groups</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.neptune.db_cluster_parameter_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -213,6 +267,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.neptune.db_cluster_parameter_groups
+SET data__PatchDocument = string('{{ {
+    "Parameters": parameters,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/neptune/db_cluster_parameter_groups_list_only/index.md b/website/docs/services/neptune/db_cluster_parameter_groups_list_only/index.md
deleted file mode 100644
index e77113f5d..000000000
--- a/website/docs/services/neptune/db_cluster_parameter_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: db_cluster_parameter_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - db_cluster_parameter_groups_list_only
-  - neptune
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>db_cluster_parameter_groups</code> in a region or regions, for all properties use <a href="/services/neptune/db_cluster_parameter_groups/"><code>db_cluster_parameter_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>db_cluster_parameter_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Neptune::DBClusterParameterGroup resource creates a new Amazon Neptune DB cluster parameter group</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.neptune.db_cluster_parameter_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Provides the name of the DB cluster parameter group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>db_cluster_parameter_groups</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.neptune.db_cluster_parameter_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>db_cluster_parameter_groups_list_only</code> resource, see <a href="/services/neptune/db_cluster_parameter_groups/#permissions"><code>db_cluster_parameter_groups</code></a>
-
diff --git a/website/docs/services/neptune/db_clusters/index.md b/website/docs/services/neptune/db_clusters/index.md
index 28fcf8794..38536ce7e 100644
--- a/website/docs/services/neptune/db_clusters/index.md
+++ b/website/docs/services/neptune/db_clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>db_cluster</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "endpoint",
@@ -221,6 +230,23 @@ Creates, updates, deletes or gets a <code>db_cluster</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "db_cluster_identifier",
+    "type": "string",
+    "description": "The DB cluster identifier. Contains a user-supplied DB cluster identifier. This identifier is the unique key that identifies a DB cluster stored as a lowercase string."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html"><code>AWS::Neptune::DBCluster</code></a>.
 
@@ -230,31 +256,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>db_clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>db_clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>db_clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>db_clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>db_clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -263,6 +295,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>db_cluster</code>.
 ```sql
 SELECT
@@ -299,6 +340,19 @@ vpc_security_group_ids
 FROM awscc.neptune.db_clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<DBClusterIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>db_clusters</code> in a region.
+```sql
+SELECT
+region,
+db_cluster_identifier
+FROM awscc.neptune.db_clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -512,6 +566,33 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.neptune.db_clusters
+SET data__PatchDocument = string('{{ {
+    "AssociatedRoles": associated_roles,
+    "BackupRetentionPeriod": backup_retention_period,
+    "CopyTagsToSnapshot": copy_tags_to_snapshot,
+    "DBClusterParameterGroupName": db_cluster_parameter_group_name,
+    "DBInstanceParameterGroupName": db_instance_parameter_group_name,
+    "DBPort": db_port,
+    "DeletionProtection": deletion_protection,
+    "EnableCloudwatchLogsExports": enable_cloudwatch_logs_exports,
+    "EngineVersion": engine_version,
+    "IamAuthEnabled": iam_auth_enabled,
+    "PreferredBackupWindow": preferred_backup_window,
+    "PreferredMaintenanceWindow": preferred_maintenance_window,
+    "ServerlessScalingConfiguration": serverless_scaling_configuration,
+    "Tags": tags,
+    "VpcSecurityGroupIds": vpc_security_group_ids
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DBClusterIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/neptune/db_clusters_list_only/index.md b/website/docs/services/neptune/db_clusters_list_only/index.md
deleted file mode 100644
index 624582ac4..000000000
--- a/website/docs/services/neptune/db_clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: db_clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - db_clusters_list_only
-  - neptune
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>db_clusters</code> in a region or regions, for all properties use <a href="/services/neptune/db_clusters/"><code>db_clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>db_clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Neptune::DBCluster resource creates an Amazon Neptune DB cluster.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.neptune.db_clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "db_cluster_identifier",
-    "type": "string",
-    "description": "The DB cluster identifier. Contains a user-supplied DB cluster identifier. This identifier is the unique key that identifies a DB cluster stored as a lowercase string."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>db_clusters</code> in a region.
-```sql
-SELECT
-region,
-db_cluster_identifier
-FROM awscc.neptune.db_clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>db_clusters_list_only</code> resource, see <a href="/services/neptune/db_clusters/#permissions"><code>db_clusters</code></a>
-
diff --git a/website/docs/services/neptune/db_instances/index.md b/website/docs/services/neptune/db_instances/index.md
index 67e6666d9..91ed4e729 100644
--- a/website/docs/services/neptune/db_instances/index.md
+++ b/website/docs/services/neptune/db_instances/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>db_instance</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "allow_major_version_upgrade",
@@ -117,6 +126,23 @@ Creates, updates, deletes or gets a <code>db_instance</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "db_instance_identifier",
+    "type": "string",
+    "description": "Contains a user-supplied database identifier. This identifier is the unique key that identifies a DB instance."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbinstance.html"><code>AWS::Neptune::DBInstance</code></a>.
 
@@ -126,31 +152,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>db_instances</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DBInstanceClass, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>db_instances</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>db_instances</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>db_instances_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>db_instances</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -159,6 +191,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>db_instance</code>.
 ```sql
 SELECT
@@ -179,6 +220,19 @@ tags
 FROM awscc.neptune.db_instances
 WHERE region = 'us-east-1' AND data__Identifier = '<DBInstanceIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>db_instances</code> in a region.
+```sql
+SELECT
+region,
+db_instance_identifier
+FROM awscc.neptune.db_instances_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -281,6 +335,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.neptune.db_instances
+SET data__PatchDocument = string('{{ {
+    "AllowMajorVersionUpgrade": allow_major_version_upgrade,
+    "AutoMinorVersionUpgrade": auto_minor_version_upgrade,
+    "DBInstanceClass": db_instance_class,
+    "DBParameterGroupName": db_parameter_group_name,
+    "PreferredMaintenanceWindow": preferred_maintenance_window,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DBInstanceIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/neptune/db_instances_list_only/index.md b/website/docs/services/neptune/db_instances_list_only/index.md
deleted file mode 100644
index d5e0467aa..000000000
--- a/website/docs/services/neptune/db_instances_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: db_instances_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - db_instances_list_only
-  - neptune
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>db_instances</code> in a region or regions, for all properties use <a href="/services/neptune/db_instances/"><code>db_instances</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>db_instances_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Neptune::DBInstance resource creates an Amazon Neptune DB instance.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.neptune.db_instances_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "db_instance_identifier",
-    "type": "string",
-    "description": "Contains a user-supplied database identifier. This identifier is the unique key that identifies a DB instance."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>db_instances</code> in a region.
-```sql
-SELECT
-region,
-db_instance_identifier
-FROM awscc.neptune.db_instances_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>db_instances_list_only</code> resource, see <a href="/services/neptune/db_instances/#permissions"><code>db_instances</code></a>
-
diff --git a/website/docs/services/neptune/db_parameter_groups/index.md b/website/docs/services/neptune/db_parameter_groups/index.md
index 798e785a3..19e58b89b 100644
--- a/website/docs/services/neptune/db_parameter_groups/index.md
+++ b/website/docs/services/neptune/db_parameter_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>db_parameter_group</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>db_parameter_group</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Provides the name of the DB parameter group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbparametergroup.html"><code>AWS::Neptune::DBParameterGroup</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>db_parameter_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Family, Description, Parameters, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>db_parameter_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>db_parameter_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>db_parameter_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>db_parameter_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>db_parameter_group</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.neptune.db_parameter_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>db_parameter_groups</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.neptune.db_parameter_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -213,6 +267,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.neptune.db_parameter_groups
+SET data__PatchDocument = string('{{ {
+    "Parameters": parameters,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/neptune/db_parameter_groups_list_only/index.md b/website/docs/services/neptune/db_parameter_groups_list_only/index.md
deleted file mode 100644
index d6dbde8ae..000000000
--- a/website/docs/services/neptune/db_parameter_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: db_parameter_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - db_parameter_groups_list_only
-  - neptune
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>db_parameter_groups</code> in a region or regions, for all properties use <a href="/services/neptune/db_parameter_groups/"><code>db_parameter_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>db_parameter_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::Neptune::DBParameterGroup creates a new DB parameter group. This type can be declared in a template and referenced in the DBParameterGroupName parameter of AWS::Neptune::DBInstance</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.neptune.db_parameter_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Provides the name of the DB parameter group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>db_parameter_groups</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.neptune.db_parameter_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>db_parameter_groups_list_only</code> resource, see <a href="/services/neptune/db_parameter_groups/#permissions"><code>db_parameter_groups</code></a>
-
diff --git a/website/docs/services/neptune/db_subnet_groups/index.md b/website/docs/services/neptune/db_subnet_groups/index.md
index 3094e4542..f7dce5c18 100644
--- a/website/docs/services/neptune/db_subnet_groups/index.md
+++ b/website/docs/services/neptune/db_subnet_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>db_subnet_group</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "db_subnet_group_name",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>db_subnet_group</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "db_subnet_group_name",
+    "type": "string",
+    "description": "The name for the DB subnet group. This value is stored as a lowercase string.<br />Constraints: Must contain no more than 255 lowercase alphanumeric characters or hyphens. Must not be \"Default\".<br />Example: mysubnetgroup<br />"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbsubnetgroup.html"><code>AWS::Neptune::DBSubnetGroup</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>db_subnet_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DBSubnetGroupDescription, SubnetIds, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>db_subnet_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>db_subnet_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>db_subnet_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>db_subnet_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>db_subnet_group</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ tags
 FROM awscc.neptune.db_subnet_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<DBSubnetGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>db_subnet_groups</code> in a region.
+```sql
+SELECT
+region,
+db_subnet_group_name
+FROM awscc.neptune.db_subnet_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -202,6 +256,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.neptune.db_subnet_groups
+SET data__PatchDocument = string('{{ {
+    "DBSubnetGroupDescription": db_subnet_group_description,
+    "SubnetIds": subnet_ids,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DBSubnetGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/neptune/db_subnet_groups_list_only/index.md b/website/docs/services/neptune/db_subnet_groups_list_only/index.md
deleted file mode 100644
index f6c717dd3..000000000
--- a/website/docs/services/neptune/db_subnet_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: db_subnet_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - db_subnet_groups_list_only
-  - neptune
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>db_subnet_groups</code> in a region or regions, for all properties use <a href="/services/neptune/db_subnet_groups/"><code>db_subnet_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>db_subnet_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Neptune::DBSubnetGroup type creates an Amazon Neptune DB subnet group. Subnet groups must contain at least two subnets in two different Availability Zones in the same AWS Region.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.neptune.db_subnet_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "db_subnet_group_name",
-    "type": "string",
-    "description": "The name for the DB subnet group. This value is stored as a lowercase string.<br />Constraints: Must contain no more than 255 lowercase alphanumeric characters or hyphens. Must not be \"Default\".<br />Example: mysubnetgroup<br />"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>db_subnet_groups</code> in a region.
-```sql
-SELECT
-region,
-db_subnet_group_name
-FROM awscc.neptune.db_subnet_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>db_subnet_groups_list_only</code> resource, see <a href="/services/neptune/db_subnet_groups/#permissions"><code>db_subnet_groups</code></a>
-
diff --git a/website/docs/services/neptune/event_subscriptions/index.md b/website/docs/services/neptune/event_subscriptions/index.md
index f35b34b96..8c2904a4f 100644
--- a/website/docs/services/neptune/event_subscriptions/index.md
+++ b/website/docs/services/neptune/event_subscriptions/index.md
@@ -90,3 +90,4 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 
 
+
diff --git a/website/docs/services/neptune/index.md b/website/docs/services/neptune/index.md
index 64dce1ea6..173268acc 100644
--- a/website/docs/services/neptune/index.md
+++ b/website/docs/services/neptune/index.md
@@ -20,7 +20,7 @@ The neptune service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>11</b></span><br />
+<span>total resources:&nbsp;<b>6</b></span><br />
 </div>
 </div>
 
@@ -30,17 +30,12 @@ The neptune service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/neptune/db_cluster_parameter_groups/">db_cluster_parameter_groups</a><br />
-<a href="/services/neptune/db_cluster_parameter_groups_list_only/">db_cluster_parameter_groups_list_only</a><br />
 <a href="/services/neptune/db_clusters/">db_clusters</a><br />
-<a href="/services/neptune/db_clusters_list_only/">db_clusters_list_only</a><br />
-<a href="/services/neptune/db_instances/">db_instances</a><br />
-<a href="/services/neptune/db_instances_list_only/">db_instances_list_only</a>
+<a href="/services/neptune/db_instances/">db_instances</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/neptune/db_parameter_groups/">db_parameter_groups</a><br />
-<a href="/services/neptune/db_parameter_groups_list_only/">db_parameter_groups_list_only</a><br />
 <a href="/services/neptune/db_subnet_groups/">db_subnet_groups</a><br />
-<a href="/services/neptune/db_subnet_groups_list_only/">db_subnet_groups_list_only</a><br />
 <a href="/services/neptune/event_subscriptions/">event_subscriptions</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/neptunegraph/graphs/index.md b/website/docs/services/neptunegraph/graphs/index.md
index 50e0bd0dd..accc90865 100644
--- a/website/docs/services/neptunegraph/graphs/index.md
+++ b/website/docs/services/neptunegraph/graphs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>graph</code> resource or lists <code>g
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "deletion_protection",
@@ -109,6 +118,23 @@ Creates, updates, deletes or gets a <code>graph</code> resource or lists <code>g
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "graph_id",
+    "type": "string",
+    "description": "The auto-generated id assigned by the service."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptunegraph-graph.html"><code>AWS::NeptuneGraph::Graph</code></a>.
 
@@ -118,31 +144,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>graphs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ProvisionedMemory, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>graphs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>graphs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>graphs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>graphs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +183,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>graph</code>.
 ```sql
 SELECT
@@ -168,6 +209,19 @@ graph_id
 FROM awscc.neptunegraph.graphs
 WHERE region = 'us-east-1' AND data__Identifier = '<GraphId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>graphs</code> in a region.
+```sql
+SELECT
+region,
+graph_id
+FROM awscc.neptunegraph.graphs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -255,6 +309,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.neptunegraph.graphs
+SET data__PatchDocument = string('{{ {
+    "DeletionProtection": deletion_protection,
+    "ProvisionedMemory": provisioned_memory,
+    "PublicConnectivity": public_connectivity,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<GraphId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/neptunegraph/graphs_list_only/index.md b/website/docs/services/neptunegraph/graphs_list_only/index.md
deleted file mode 100644
index 4b19d0d23..000000000
--- a/website/docs/services/neptunegraph/graphs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: graphs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - graphs_list_only
-  - neptunegraph
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>graphs</code> in a region or regions, for all properties use <a href="/services/neptunegraph/graphs/"><code>graphs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>graphs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::NeptuneGraph::Graph resource creates an Amazon NeptuneGraph Graph.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.neptunegraph.graphs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "graph_id",
-    "type": "string",
-    "description": "The auto-generated id assigned by the service."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>graphs</code> in a region.
-```sql
-SELECT
-region,
-graph_id
-FROM awscc.neptunegraph.graphs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>graphs_list_only</code> resource, see <a href="/services/neptunegraph/graphs/#permissions"><code>graphs</code></a>
-
diff --git a/website/docs/services/neptunegraph/index.md b/website/docs/services/neptunegraph/index.md
index 18fbc78ae..4bb2483c9 100644
--- a/website/docs/services/neptunegraph/index.md
+++ b/website/docs/services/neptunegraph/index.md
@@ -20,7 +20,7 @@ The neptunegraph service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The neptunegraph service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/neptunegraph/graphs/">graphs</a><br />
-<a href="/services/neptunegraph/graphs_list_only/">graphs_list_only</a>
+<a href="/services/neptunegraph/graphs/">graphs</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/neptunegraph/private_graph_endpoints/">private_graph_endpoints</a><br />
-<a href="/services/neptunegraph/private_graph_endpoints_list_only/">private_graph_endpoints_list_only</a>
+<a href="/services/neptunegraph/private_graph_endpoints/">private_graph_endpoints</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/neptunegraph/private_graph_endpoints/index.md b/website/docs/services/neptunegraph/private_graph_endpoints/index.md
index 18aa1ce60..ab1ade3bf 100644
--- a/website/docs/services/neptunegraph/private_graph_endpoints/index.md
+++ b/website/docs/services/neptunegraph/private_graph_endpoints/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>private_graph_endpoint</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "graph_identifier",
@@ -70,6 +79,23 @@ Creates, updates, deletes or gets a <code>private_graph_endpoint</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "private_graph_endpoint_identifier",
+    "type": "string",
+    "description": "PrivateGraphEndpoint resource identifier generated by concatenating the associated GraphIdentifier and VpcId with an underscore separator.<br />For example, if GraphIdentifier is &#96;g-12a3bcdef4&#96; and VpcId is &#96;vpc-0a12bc34567de8f90&#96;, the generated PrivateGraphEndpointIdentifier will be &#96;g-12a3bcdef4&#95;vpc-0a12bc34567de8f90&#96;"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptunegraph-privategraphendpoint.html"><code>AWS::NeptuneGraph::PrivateGraphEndpoint</code></a>.
 
@@ -79,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>private_graph_endpoints</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GraphIdentifier, VpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>private_graph_endpoints</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>private_graph_endpoints</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>private_graph_endpoints_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>private_graph_endpoints</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>private_graph_endpoint</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ vpc_endpoint_id
 FROM awscc.neptunegraph.private_graph_endpoints
 WHERE region = 'us-east-1' AND data__Identifier = '<PrivateGraphEndpointIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>private_graph_endpoints</code> in a region.
+```sql
+SELECT
+region,
+private_graph_endpoint_identifier
+FROM awscc.neptunegraph.private_graph_endpoints_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -201,6 +255,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/neptunegraph/private_graph_endpoints_list_only/index.md b/website/docs/services/neptunegraph/private_graph_endpoints_list_only/index.md
deleted file mode 100644
index 743e9635d..000000000
--- a/website/docs/services/neptunegraph/private_graph_endpoints_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: private_graph_endpoints_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - private_graph_endpoints_list_only
-  - neptunegraph
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>private_graph_endpoints</code> in a region or regions, for all properties use <a href="/services/neptunegraph/private_graph_endpoints/"><code>private_graph_endpoints</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>private_graph_endpoints_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::NeptuneGraph::PrivateGraphEndpoint resource creates an Amazon NeptuneGraph PrivateGraphEndpoint.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.neptunegraph.private_graph_endpoints_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "private_graph_endpoint_identifier",
-    "type": "string",
-    "description": "PrivateGraphEndpoint resource identifier generated by concatenating the associated GraphIdentifier and VpcId with an underscore separator.<br />For example, if GraphIdentifier is &#96;g-12a3bcdef4&#96; and VpcId is &#96;vpc-0a12bc34567de8f90&#96;, the generated PrivateGraphEndpointIdentifier will be &#96;g-12a3bcdef4&#95;vpc-0a12bc34567de8f90&#96;"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>private_graph_endpoints</code> in a region.
-```sql
-SELECT
-region,
-private_graph_endpoint_identifier
-FROM awscc.neptunegraph.private_graph_endpoints_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>private_graph_endpoints_list_only</code> resource, see <a href="/services/neptunegraph/private_graph_endpoints/#permissions"><code>private_graph_endpoints</code></a>
-
diff --git a/website/docs/services/networkfirewall/firewall_policies/index.md b/website/docs/services/networkfirewall/firewall_policies/index.md
index 828d813e5..0ad526c0a 100644
--- a/website/docs/services/networkfirewall/firewall_policies/index.md
+++ b/website/docs/services/networkfirewall/firewall_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>firewall_policy</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "firewall_policy_name",
@@ -116,6 +125,62 @@ Creates, updates, deletes or gets a <code>firewall_policy</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "firewall_policy_arn",
+    "type": "string",
+    "description": "A resource ARN."
+  },
+  {
+    "name": "firewall_policy",
+    "type": "object",
+    "description": "Resource type definition for AWS::NetworkFirewall::FirewallPolicy",
+    "children": [
+      {
+        "name": "firewall_policy_name",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "firewall_policy_id",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "description",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "tags",
+        "type": "array",
+        "description": "",
+        "children": [
+          {
+            "name": "key",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "value",
+            "type": "string",
+            "description": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewallpolicy.html"><code>AWS::NetworkFirewall::FirewallPolicy</code></a>.
 
@@ -125,31 +190,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>firewall_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FirewallPolicyName, FirewallPolicy, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>firewall_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>firewall_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>firewall_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>firewall_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -158,6 +229,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>firewall_policy</code>.
 ```sql
 SELECT
@@ -171,6 +251,19 @@ tags
 FROM awscc.networkfirewall.firewall_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<FirewallPolicyArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>firewall_policies</code> in a region.
+```sql
+SELECT
+region,
+firewall_policy_arn
+FROM awscc.networkfirewall.firewall_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -252,6 +345,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkfirewall.firewall_policies
+SET data__PatchDocument = string('{{ {
+    "FirewallPolicy": firewall_policy,
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FirewallPolicyArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkfirewall/firewall_policies_list_only/index.md b/website/docs/services/networkfirewall/firewall_policies_list_only/index.md
deleted file mode 100644
index aa237c543..000000000
--- a/website/docs/services/networkfirewall/firewall_policies_list_only/index.md
+++ /dev/null
@@ -1,119 +0,0 @@
----
-title: firewall_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - firewall_policies_list_only
-  - networkfirewall
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>firewall_policies</code> in a region or regions, for all properties use <a href="/services/networkfirewall/firewall_policies/"><code>firewall_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>firewall_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::NetworkFirewall::FirewallPolicy</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkfirewall.firewall_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "firewall_policy_arn",
-    "type": "string",
-    "description": "A resource ARN."
-  },
-  {
-    "name": "firewall_policy",
-    "type": "object",
-    "description": "Resource type definition for AWS::NetworkFirewall::FirewallPolicy",
-    "children": [
-      {
-        "name": "firewall_policy_name",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "firewall_policy_id",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "description",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "",
-        "children": [
-          {
-            "name": "key",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "value",
-            "type": "string",
-            "description": ""
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>firewall_policies</code> in a region.
-```sql
-SELECT
-region,
-firewall_policy_arn
-FROM awscc.networkfirewall.firewall_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>firewall_policies_list_only</code> resource, see <a href="/services/networkfirewall/firewall_policies/#permissions"><code>firewall_policies</code></a>
-
diff --git a/website/docs/services/networkfirewall/firewalls/index.md b/website/docs/services/networkfirewall/firewalls/index.md
index 862e28e08..01ada4465 100644
--- a/website/docs/services/networkfirewall/firewalls/index.md
+++ b/website/docs/services/networkfirewall/firewalls/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>firewall</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "firewall_name",
@@ -146,6 +155,23 @@ Creates, updates, deletes or gets a <code>firewall</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "firewall_arn",
+    "type": "string",
+    "description": "A resource ARN."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewall.html"><code>AWS::NetworkFirewall::Firewall</code></a>.
 
@@ -155,31 +181,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>firewalls</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FirewallName, FirewallPolicyArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>firewalls</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>firewalls</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>firewalls_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>firewalls</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -188,6 +220,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>firewall</code>.
 ```sql
 SELECT
@@ -211,6 +252,19 @@ tags
 FROM awscc.networkfirewall.firewalls
 WHERE region = 'us-east-1' AND data__Identifier = '<FirewallArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>firewalls</code> in a region.
+```sql
+SELECT
+region,
+firewall_arn
+FROM awscc.networkfirewall.firewalls_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -327,6 +381,29 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkfirewall.firewalls
+SET data__PatchDocument = string('{{ {
+    "FirewallPolicyArn": firewall_policy_arn,
+    "SubnetMappings": subnet_mappings,
+    "AvailabilityZoneMappings": availability_zone_mappings,
+    "DeleteProtection": delete_protection,
+    "SubnetChangeProtection": subnet_change_protection,
+    "AvailabilityZoneChangeProtection": availability_zone_change_protection,
+    "FirewallPolicyChangeProtection": firewall_policy_change_protection,
+    "TransitGatewayId": transit_gateway_id,
+    "Description": description,
+    "EnabledAnalysisTypes": enabled_analysis_types,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FirewallArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkfirewall/firewalls_list_only/index.md b/website/docs/services/networkfirewall/firewalls_list_only/index.md
deleted file mode 100644
index c67f61e07..000000000
--- a/website/docs/services/networkfirewall/firewalls_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: firewalls_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - firewalls_list_only
-  - networkfirewall
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>firewalls</code> in a region or regions, for all properties use <a href="/services/networkfirewall/firewalls/"><code>firewalls</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>firewalls_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::NetworkFirewall::Firewall</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkfirewall.firewalls_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "firewall_arn",
-    "type": "string",
-    "description": "A resource ARN."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>firewalls</code> in a region.
-```sql
-SELECT
-region,
-firewall_arn
-FROM awscc.networkfirewall.firewalls_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>firewalls_list_only</code> resource, see <a href="/services/networkfirewall/firewalls/#permissions"><code>firewalls</code></a>
-
diff --git a/website/docs/services/networkfirewall/index.md b/website/docs/services/networkfirewall/index.md
index 5dd6c756f..11bcabd84 100644
--- a/website/docs/services/networkfirewall/index.md
+++ b/website/docs/services/networkfirewall/index.md
@@ -20,7 +20,7 @@ The networkfirewall service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>11</b></span><br />
+<span>total resources:&nbsp;<b>6</b></span><br />
 </div>
 </div>
 
@@ -30,17 +30,12 @@ The networkfirewall service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/networkfirewall/firewall_policies/">firewall_policies</a><br />
-<a href="/services/networkfirewall/firewall_policies_list_only/">firewall_policies_list_only</a><br />
 <a href="/services/networkfirewall/firewalls/">firewalls</a><br />
-<a href="/services/networkfirewall/firewalls_list_only/">firewalls_list_only</a><br />
-<a href="/services/networkfirewall/logging_configurations/">logging_configurations</a><br />
-<a href="/services/networkfirewall/rule_groups/">rule_groups</a>
+<a href="/services/networkfirewall/logging_configurations/">logging_configurations</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/networkfirewall/rule_groups_list_only/">rule_groups_list_only</a><br />
+<a href="/services/networkfirewall/rule_groups/">rule_groups</a><br />
 <a href="/services/networkfirewall/tls_inspection_configurations/">tls_inspection_configurations</a><br />
-<a href="/services/networkfirewall/tls_inspection_configurations_list_only/">tls_inspection_configurations_list_only</a><br />
-<a href="/services/networkfirewall/vpc_endpoint_associations/">vpc_endpoint_associations</a><br />
-<a href="/services/networkfirewall/vpc_endpoint_associations_list_only/">vpc_endpoint_associations_list_only</a>
+<a href="/services/networkfirewall/vpc_endpoint_associations/">vpc_endpoint_associations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/networkfirewall/logging_configurations/index.md b/website/docs/services/networkfirewall/logging_configurations/index.md
index 63360c5f9..9fa179a7e 100644
--- a/website/docs/services/networkfirewall/logging_configurations/index.md
+++ b/website/docs/services/networkfirewall/logging_configurations/index.md
@@ -198,6 +198,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkfirewall.logging_configurations
+SET data__PatchDocument = string('{{ {
+    "LoggingConfiguration": logging_configuration,
+    "EnableMonitoringDashboard": enable_monitoring_dashboard
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FirewallArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkfirewall/rule_groups/index.md b/website/docs/services/networkfirewall/rule_groups/index.md
index f28bb8493..e8a789294 100644
--- a/website/docs/services/networkfirewall/rule_groups/index.md
+++ b/website/docs/services/networkfirewall/rule_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>rule_group</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "rule_group_name",
@@ -160,6 +169,84 @@ Creates, updates, deletes or gets a <code>rule_group</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "rule_group_arn",
+    "type": "string",
+    "description": "A resource ARN."
+  },
+  {
+    "name": "rule_group",
+    "type": "object",
+    "description": "Resource type definition for AWS::NetworkFirewall::RuleGroup",
+    "children": [
+      {
+        "name": "rule_group_name",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "rule_group_id",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "type",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "capacity",
+        "type": "integer",
+        "description": ""
+      },
+      {
+        "name": "summary_configuration",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "rule_options",
+            "type": "array",
+            "description": ""
+          }
+        ]
+      },
+      {
+        "name": "description",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "tags",
+        "type": "array",
+        "description": "",
+        "children": [
+          {
+            "name": "key",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "value",
+            "type": "string",
+            "description": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-rulegroup.html"><code>AWS::NetworkFirewall::RuleGroup</code></a>.
 
@@ -169,31 +256,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>rule_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, Capacity, RuleGroupName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>rule_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>rule_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>rule_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>rule_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -202,6 +295,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>rule_group</code>.
 ```sql
 SELECT
@@ -218,6 +320,19 @@ tags
 FROM awscc.networkfirewall.rule_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<RuleGroupArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>rule_groups</code> in a region.
+```sql
+SELECT
+region,
+rule_group_arn
+FROM awscc.networkfirewall.rule_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -320,6 +435,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkfirewall.rule_groups
+SET data__PatchDocument = string('{{ {
+    "RuleGroup": rule_group,
+    "SummaryConfiguration": summary_configuration,
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RuleGroupArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkfirewall/rule_groups_list_only/index.md b/website/docs/services/networkfirewall/rule_groups_list_only/index.md
deleted file mode 100644
index b826584c0..000000000
--- a/website/docs/services/networkfirewall/rule_groups_list_only/index.md
+++ /dev/null
@@ -1,141 +0,0 @@
----
-title: rule_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - rule_groups_list_only
-  - networkfirewall
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>rule_groups</code> in a region or regions, for all properties use <a href="/services/networkfirewall/rule_groups/"><code>rule_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>rule_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::NetworkFirewall::RuleGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkfirewall.rule_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "rule_group_arn",
-    "type": "string",
-    "description": "A resource ARN."
-  },
-  {
-    "name": "rule_group",
-    "type": "object",
-    "description": "Resource type definition for AWS::NetworkFirewall::RuleGroup",
-    "children": [
-      {
-        "name": "rule_group_name",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "rule_group_id",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "type",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "capacity",
-        "type": "integer",
-        "description": ""
-      },
-      {
-        "name": "summary_configuration",
-        "type": "object",
-        "description": "",
-        "children": [
-          {
-            "name": "rule_options",
-            "type": "array",
-            "description": ""
-          }
-        ]
-      },
-      {
-        "name": "description",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "",
-        "children": [
-          {
-            "name": "key",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "value",
-            "type": "string",
-            "description": ""
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>rule_groups</code> in a region.
-```sql
-SELECT
-region,
-rule_group_arn
-FROM awscc.networkfirewall.rule_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>rule_groups_list_only</code> resource, see <a href="/services/networkfirewall/rule_groups/#permissions"><code>rule_groups</code></a>
-
diff --git a/website/docs/services/networkfirewall/tls_inspection_configurations/index.md b/website/docs/services/networkfirewall/tls_inspection_configurations/index.md
index 5785f16b9..91e3c13ea 100644
--- a/website/docs/services/networkfirewall/tls_inspection_configurations/index.md
+++ b/website/docs/services/networkfirewall/tls_inspection_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>tls_inspection_configuration</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "tls_inspection_configuration_name",
@@ -116,6 +125,62 @@ Creates, updates, deletes or gets a <code>tls_inspection_configuration</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "tls_inspection_configuration_arn",
+    "type": "string",
+    "description": "A resource ARN."
+  },
+  {
+    "name": "tls_inspection_configuration",
+    "type": "object",
+    "description": "Resource type definition for AWS::NetworkFirewall::TLSInspectionConfiguration",
+    "children": [
+      {
+        "name": "tls_inspection_configuration_name",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "tls_inspection_configuration_id",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "description",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "tags",
+        "type": "array",
+        "description": "",
+        "children": [
+          {
+            "name": "key",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "value",
+            "type": "string",
+            "description": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-tlsinspectionconfiguration.html"><code>AWS::NetworkFirewall::TLSInspectionConfiguration</code></a>.
 
@@ -125,31 +190,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>tls_inspection_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TLSInspectionConfigurationName, TLSInspectionConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>tls_inspection_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>tls_inspection_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>tls_inspection_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>tls_inspection_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -158,6 +229,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>tls_inspection_configuration</code>.
 ```sql
 SELECT
@@ -171,6 +251,19 @@ tags
 FROM awscc.networkfirewall.tls_inspection_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<TLSInspectionConfigurationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>tls_inspection_configurations</code> in a region.
+```sql
+SELECT
+region,
+tls_inspection_configuration_arn
+FROM awscc.networkfirewall.tls_inspection_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -252,6 +345,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkfirewall.tls_inspection_configurations
+SET data__PatchDocument = string('{{ {
+    "TLSInspectionConfiguration": tls_inspection_configuration,
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TLSInspectionConfigurationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkfirewall/tls_inspection_configurations_list_only/index.md b/website/docs/services/networkfirewall/tls_inspection_configurations_list_only/index.md
deleted file mode 100644
index 53ec9dbe7..000000000
--- a/website/docs/services/networkfirewall/tls_inspection_configurations_list_only/index.md
+++ /dev/null
@@ -1,119 +0,0 @@
----
-title: tls_inspection_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - tls_inspection_configurations_list_only
-  - networkfirewall
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>tls_inspection_configurations</code> in a region or regions, for all properties use <a href="/services/networkfirewall/tls_inspection_configurations/"><code>tls_inspection_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>tls_inspection_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::NetworkFirewall::TLSInspectionConfiguration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkfirewall.tls_inspection_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "tls_inspection_configuration_arn",
-    "type": "string",
-    "description": "A resource ARN."
-  },
-  {
-    "name": "tls_inspection_configuration",
-    "type": "object",
-    "description": "Resource type definition for AWS::NetworkFirewall::TLSInspectionConfiguration",
-    "children": [
-      {
-        "name": "tls_inspection_configuration_name",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "tls_inspection_configuration_id",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "description",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "",
-        "children": [
-          {
-            "name": "key",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "value",
-            "type": "string",
-            "description": ""
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>tls_inspection_configurations</code> in a region.
-```sql
-SELECT
-region,
-tls_inspection_configuration_arn
-FROM awscc.networkfirewall.tls_inspection_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>tls_inspection_configurations_list_only</code> resource, see <a href="/services/networkfirewall/tls_inspection_configurations/#permissions"><code>tls_inspection_configurations</code></a>
-
diff --git a/website/docs/services/networkfirewall/vpc_endpoint_associations/index.md b/website/docs/services/networkfirewall/vpc_endpoint_associations/index.md
index c5af96bac..0bec6b2f5 100644
--- a/website/docs/services/networkfirewall/vpc_endpoint_associations/index.md
+++ b/website/docs/services/networkfirewall/vpc_endpoint_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_endpoint_association</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "vpc_endpoint_association_arn",
@@ -99,6 +108,23 @@ Creates, updates, deletes or gets a <code>vpc_endpoint_association</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "vpc_endpoint_association_arn",
+    "type": "string",
+    "description": "A resource ARN."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-vpcendpointassociation.html"><code>AWS::NetworkFirewall::VpcEndpointAssociation</code></a>.
 
@@ -108,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_endpoint_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FirewallArn, VpcId, SubnetMapping, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_endpoint_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_endpoint_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_endpoint_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_endpoint_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_endpoint_association</code>.
 ```sql
 SELECT
@@ -156,6 +197,19 @@ tags
 FROM awscc.networkfirewall.vpc_endpoint_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<VpcEndpointAssociationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_endpoint_associations</code> in a region.
+```sql
+SELECT
+region,
+vpc_endpoint_association_arn
+FROM awscc.networkfirewall.vpc_endpoint_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -240,6 +294,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkfirewall.vpc_endpoint_associations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<VpcEndpointAssociationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkfirewall/vpc_endpoint_associations_list_only/index.md b/website/docs/services/networkfirewall/vpc_endpoint_associations_list_only/index.md
deleted file mode 100644
index 35847713e..000000000
--- a/website/docs/services/networkfirewall/vpc_endpoint_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpc_endpoint_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_endpoint_associations_list_only
-  - networkfirewall
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_endpoint_associations</code> in a region or regions, for all properties use <a href="/services/networkfirewall/vpc_endpoint_associations/"><code>vpc_endpoint_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_endpoint_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::NetworkFirewall::VpcEndpointAssociation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkfirewall.vpc_endpoint_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "vpc_endpoint_association_arn",
-    "type": "string",
-    "description": "A resource ARN."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_endpoint_associations</code> in a region.
-```sql
-SELECT
-region,
-vpc_endpoint_association_arn
-FROM awscc.networkfirewall.vpc_endpoint_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_endpoint_associations_list_only</code> resource, see <a href="/services/networkfirewall/vpc_endpoint_associations/#permissions"><code>vpc_endpoint_associations</code></a>
-
diff --git a/website/docs/services/networkmanager/connect_attachments/index.md b/website/docs/services/networkmanager/connect_attachments/index.md
index d110f162b..374bb50bc 100644
--- a/website/docs/services/networkmanager/connect_attachments/index.md
+++ b/website/docs/services/networkmanager/connect_attachments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>connect_attachment</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "core_network_id",
@@ -207,6 +216,23 @@ Creates, updates, deletes or gets a <code>connect_attachment</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "attachment_id",
+    "type": "string",
+    "description": "The ID of the attachment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-connectattachment.html"><code>AWS::NetworkManager::ConnectAttachment</code></a>.
 
@@ -216,31 +242,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>connect_attachments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CoreNetworkId, EdgeLocation, TransportAttachmentId, Options, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>connect_attachments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>connect_attachments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>connect_attachments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>connect_attachments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -249,6 +281,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>connect_attachment</code>.
 ```sql
 SELECT
@@ -274,6 +315,19 @@ options
 FROM awscc.networkmanager.connect_attachments
 WHERE region = 'us-east-1' AND data__Identifier = '<AttachmentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>connect_attachments</code> in a region.
+```sql
+SELECT
+region,
+attachment_id
+FROM awscc.networkmanager.connect_attachments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -379,6 +433,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkmanager.connect_attachments
+SET data__PatchDocument = string('{{ {
+    "ProposedSegmentChange": proposed_segment_change,
+    "NetworkFunctionGroupName": network_function_group_name,
+    "ProposedNetworkFunctionGroupChange": proposed_network_function_group_change,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AttachmentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkmanager/connect_attachments_list_only/index.md b/website/docs/services/networkmanager/connect_attachments_list_only/index.md
deleted file mode 100644
index a76fc7326..000000000
--- a/website/docs/services/networkmanager/connect_attachments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: connect_attachments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - connect_attachments_list_only
-  - networkmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>connect_attachments</code> in a region or regions, for all properties use <a href="/services/networkmanager/connect_attachments/"><code>connect_attachments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>connect_attachments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::NetworkManager::ConnectAttachment Resource Type Definition</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkmanager.connect_attachments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "attachment_id",
-    "type": "string",
-    "description": "The ID of the attachment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>connect_attachments</code> in a region.
-```sql
-SELECT
-region,
-attachment_id
-FROM awscc.networkmanager.connect_attachments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>connect_attachments_list_only</code> resource, see <a href="/services/networkmanager/connect_attachments/#permissions"><code>connect_attachments</code></a>
-
diff --git a/website/docs/services/networkmanager/connect_peers/index.md b/website/docs/services/networkmanager/connect_peers/index.md
index 5113dcb6c..28500effa 100644
--- a/website/docs/services/networkmanager/connect_peers/index.md
+++ b/website/docs/services/networkmanager/connect_peers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>connect_peer</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "peer_address",
@@ -173,6 +182,23 @@ Creates, updates, deletes or gets a <code>connect_peer</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "connect_peer_id",
+    "type": "string",
+    "description": "The ID of the Connect peer."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-connectpeer.html"><code>AWS::NetworkManager::ConnectPeer</code></a>.
 
@@ -182,31 +208,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>connect_peers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConnectAttachmentId, PeerAddress, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>connect_peers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>connect_peers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>connect_peers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>connect_peers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -215,6 +247,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>connect_peer</code>.
 ```sql
 SELECT
@@ -235,6 +276,19 @@ tags
 FROM awscc.networkmanager.connect_peers
 WHERE region = 'us-east-1' AND data__Identifier = '<ConnectPeerId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>connect_peers</code> in a region.
+```sql
+SELECT
+region,
+connect_peer_id
+FROM awscc.networkmanager.connect_peers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -325,6 +379,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkmanager.connect_peers
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConnectPeerId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkmanager/connect_peers_list_only/index.md b/website/docs/services/networkmanager/connect_peers_list_only/index.md
deleted file mode 100644
index 770baade3..000000000
--- a/website/docs/services/networkmanager/connect_peers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: connect_peers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - connect_peers_list_only
-  - networkmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>connect_peers</code> in a region or regions, for all properties use <a href="/services/networkmanager/connect_peers/"><code>connect_peers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>connect_peers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::NetworkManager::ConnectPeer Resource Type Definition.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkmanager.connect_peers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "connect_peer_id",
-    "type": "string",
-    "description": "The ID of the Connect peer."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>connect_peers</code> in a region.
-```sql
-SELECT
-region,
-connect_peer_id
-FROM awscc.networkmanager.connect_peers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>connect_peers_list_only</code> resource, see <a href="/services/networkmanager/connect_peers/#permissions"><code>connect_peers</code></a>
-
diff --git a/website/docs/services/networkmanager/core_networks/index.md b/website/docs/services/networkmanager/core_networks/index.md
index ecca1ee39..e107c452c 100644
--- a/website/docs/services/networkmanager/core_networks/index.md
+++ b/website/docs/services/networkmanager/core_networks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>core_network</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "global_network_id",
@@ -175,6 +184,23 @@ Creates, updates, deletes or gets a <code>core_network</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "core_network_id",
+    "type": "string",
+    "description": "The Id of core network"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-corenetwork.html"><code>AWS::NetworkManager::CoreNetwork</code></a>.
 
@@ -184,31 +210,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>core_networks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GlobalNetworkId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>core_networks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>core_networks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>core_networks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>core_networks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -217,6 +249,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>core_network</code>.
 ```sql
 SELECT
@@ -236,6 +277,19 @@ tags
 FROM awscc.networkmanager.core_networks
 WHERE region = 'us-east-1' AND data__Identifier = '<CoreNetworkId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>core_networks</code> in a region.
+```sql
+SELECT
+region,
+core_network_id
+FROM awscc.networkmanager.core_networks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -310,6 +364,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkmanager.core_networks
+SET data__PatchDocument = string('{{ {
+    "PolicyDocument": policy_document,
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CoreNetworkId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkmanager/core_networks_list_only/index.md b/website/docs/services/networkmanager/core_networks_list_only/index.md
deleted file mode 100644
index 102b28a40..000000000
--- a/website/docs/services/networkmanager/core_networks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: core_networks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - core_networks_list_only
-  - networkmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>core_networks</code> in a region or regions, for all properties use <a href="/services/networkmanager/core_networks/"><code>core_networks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>core_networks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::NetworkManager::CoreNetwork Resource Type Definition.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkmanager.core_networks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "core_network_id",
-    "type": "string",
-    "description": "The Id of core network"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>core_networks</code> in a region.
-```sql
-SELECT
-region,
-core_network_id
-FROM awscc.networkmanager.core_networks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>core_networks_list_only</code> resource, see <a href="/services/networkmanager/core_networks/#permissions"><code>core_networks</code></a>
-
diff --git a/website/docs/services/networkmanager/customer_gateway_associations/index.md b/website/docs/services/networkmanager/customer_gateway_associations/index.md
index a7fbb1d9e..b93b80e86 100644
--- a/website/docs/services/networkmanager/customer_gateway_associations/index.md
+++ b/website/docs/services/networkmanager/customer_gateway_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>customer_gateway_association</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "global_network_id",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets a <code>customer_gateway_association</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "global_network_id",
+    "type": "string",
+    "description": "The ID of the global network."
+  },
+  {
+    "name": "customer_gateway_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the customer gateway."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-customergatewayassociation.html"><code>AWS::NetworkManager::CustomerGatewayAssociation</code></a>.
 
@@ -69,26 +100,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>customer_gateway_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GlobalNetworkId, CustomerGatewayArn, DeviceId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>customer_gateway_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>customer_gateway_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>customer_gateway_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +133,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>customer_gateway_association</code>.
 ```sql
 SELECT
@@ -108,6 +153,20 @@ link_id
 FROM awscc.networkmanager.customer_gateway_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<GlobalNetworkId>|<CustomerGatewayArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>customer_gateway_associations</code> in a region.
+```sql
+SELECT
+region,
+global_network_id,
+customer_gateway_arn
+FROM awscc.networkmanager.customer_gateway_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -184,6 +243,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkmanager/customer_gateway_associations_list_only/index.md b/website/docs/services/networkmanager/customer_gateway_associations_list_only/index.md
deleted file mode 100644
index 54a81acdd..000000000
--- a/website/docs/services/networkmanager/customer_gateway_associations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: customer_gateway_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - customer_gateway_associations_list_only
-  - networkmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>customer_gateway_associations</code> in a region or regions, for all properties use <a href="/services/networkmanager/customer_gateway_associations/"><code>customer_gateway_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>customer_gateway_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::NetworkManager::CustomerGatewayAssociation type associates a customer gateway with a device and optionally, with a link.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkmanager.customer_gateway_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "global_network_id",
-    "type": "string",
-    "description": "The ID of the global network."
-  },
-  {
-    "name": "customer_gateway_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the customer gateway."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>customer_gateway_associations</code> in a region.
-```sql
-SELECT
-region,
-global_network_id,
-customer_gateway_arn
-FROM awscc.networkmanager.customer_gateway_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>customer_gateway_associations_list_only</code> resource, see <a href="/services/networkmanager/customer_gateway_associations/#permissions"><code>customer_gateway_associations</code></a>
-
diff --git a/website/docs/services/networkmanager/devices/index.md b/website/docs/services/networkmanager/devices/index.md
index df560f317..e3cf5a267 100644
--- a/website/docs/services/networkmanager/devices/index.md
+++ b/website/docs/services/networkmanager/devices/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>device</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "device_arn",
@@ -151,6 +160,28 @@ Creates, updates, deletes or gets a <code>device</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "device_id",
+    "type": "string",
+    "description": "The ID of the device."
+  },
+  {
+    "name": "global_network_id",
+    "type": "string",
+    "description": "The ID of the global network."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-device.html"><code>AWS::NetworkManager::Device</code></a>.
 
@@ -160,31 +191,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>devices</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GlobalNetworkId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>devices</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>devices</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>devices_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>devices</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -193,6 +230,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>device</code>.
 ```sql
 SELECT
@@ -214,6 +260,20 @@ state
 FROM awscc.networkmanager.devices
 WHERE region = 'us-east-1' AND data__Identifier = '<GlobalNetworkId>|<DeviceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>devices</code> in a region.
+```sql
+SELECT
+region,
+global_network_id,
+device_id
+FROM awscc.networkmanager.devices_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -317,6 +377,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkmanager.devices
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags,
+    "AWSLocation": aws_location,
+    "Location": location,
+    "Model": model,
+    "SerialNumber": serial_number,
+    "SiteId": site_id,
+    "Type": type,
+    "Vendor": vendor
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<GlobalNetworkId>|<DeviceId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkmanager/devices_list_only/index.md b/website/docs/services/networkmanager/devices_list_only/index.md
deleted file mode 100644
index b6b04fdb8..000000000
--- a/website/docs/services/networkmanager/devices_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: devices_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - devices_list_only
-  - networkmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>devices</code> in a region or regions, for all properties use <a href="/services/networkmanager/devices/"><code>devices</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>devices_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::NetworkManager::Device type describes a device.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkmanager.devices_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "device_id",
-    "type": "string",
-    "description": "The ID of the device."
-  },
-  {
-    "name": "global_network_id",
-    "type": "string",
-    "description": "The ID of the global network."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>devices</code> in a region.
-```sql
-SELECT
-region,
-global_network_id,
-device_id
-FROM awscc.networkmanager.devices_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>devices_list_only</code> resource, see <a href="/services/networkmanager/devices/#permissions"><code>devices</code></a>
-
diff --git a/website/docs/services/networkmanager/direct_connect_gateway_attachments/index.md b/website/docs/services/networkmanager/direct_connect_gateway_attachments/index.md
index 50507d4a9..8e206f309 100644
--- a/website/docs/services/networkmanager/direct_connect_gateway_attachments/index.md
+++ b/website/docs/services/networkmanager/direct_connect_gateway_attachments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>direct_connect_gateway_attachment</cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "core_network_id",
@@ -195,6 +204,23 @@ Creates, updates, deletes or gets a <code>direct_connect_gateway_attachment</cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "attachment_id",
+    "type": "string",
+    "description": "Id of the attachment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-directconnectgatewayattachment.html"><code>AWS::NetworkManager::DirectConnectGatewayAttachment</code></a>.
 
@@ -204,31 +230,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>direct_connect_gateway_attachments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CoreNetworkId, DirectConnectGatewayArn, EdgeLocations, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>direct_connect_gateway_attachments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>direct_connect_gateway_attachments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>direct_connect_gateway_attachments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>direct_connect_gateway_attachments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -237,6 +269,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>direct_connect_gateway_attachment</code>.
 ```sql
 SELECT
@@ -261,6 +302,19 @@ updated_at
 FROM awscc.networkmanager.direct_connect_gateway_attachments
 WHERE region = 'us-east-1' AND data__Identifier = '<AttachmentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>direct_connect_gateway_attachments</code> in a region.
+```sql
+SELECT
+region,
+attachment_id
+FROM awscc.networkmanager.direct_connect_gateway_attachments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -356,6 +410,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkmanager.direct_connect_gateway_attachments
+SET data__PatchDocument = string('{{ {
+    "EdgeLocations": edge_locations,
+    "ProposedSegmentChange": proposed_segment_change,
+    "ProposedNetworkFunctionGroupChange": proposed_network_function_group_change,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AttachmentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkmanager/direct_connect_gateway_attachments_list_only/index.md b/website/docs/services/networkmanager/direct_connect_gateway_attachments_list_only/index.md
deleted file mode 100644
index fabc29a01..000000000
--- a/website/docs/services/networkmanager/direct_connect_gateway_attachments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: direct_connect_gateway_attachments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - direct_connect_gateway_attachments_list_only
-  - networkmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>direct_connect_gateway_attachments</code> in a region or regions, for all properties use <a href="/services/networkmanager/direct_connect_gateway_attachments/"><code>direct_connect_gateway_attachments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>direct_connect_gateway_attachments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::NetworkManager::DirectConnectGatewayAttachment Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkmanager.direct_connect_gateway_attachments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "attachment_id",
-    "type": "string",
-    "description": "Id of the attachment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>direct_connect_gateway_attachments</code> in a region.
-```sql
-SELECT
-region,
-attachment_id
-FROM awscc.networkmanager.direct_connect_gateway_attachments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>direct_connect_gateway_attachments_list_only</code> resource, see <a href="/services/networkmanager/direct_connect_gateway_attachments/#permissions"><code>direct_connect_gateway_attachments</code></a>
-
diff --git a/website/docs/services/networkmanager/global_networks/index.md b/website/docs/services/networkmanager/global_networks/index.md
index 23a56a5a9..0909ac66d 100644
--- a/website/docs/services/networkmanager/global_networks/index.md
+++ b/website/docs/services/networkmanager/global_networks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>global_network</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>global_network</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the global network."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-globalnetwork.html"><code>AWS::NetworkManager::GlobalNetwork</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>global_networks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>global_networks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>global_networks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>global_networks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>global_networks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>global_network</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ state
 FROM awscc.networkmanager.global_networks
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>global_networks</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.networkmanager.global_networks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +271,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkmanager.global_networks
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags,
+    "CreatedAt": created_at,
+    "State": state
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkmanager/global_networks_list_only/index.md b/website/docs/services/networkmanager/global_networks_list_only/index.md
deleted file mode 100644
index 13bdcd531..000000000
--- a/website/docs/services/networkmanager/global_networks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: global_networks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - global_networks_list_only
-  - networkmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>global_networks</code> in a region or regions, for all properties use <a href="/services/networkmanager/global_networks/"><code>global_networks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>global_networks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::NetworkManager::GlobalNetwork type specifies a global network of the user's account</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkmanager.global_networks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the global network."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>global_networks</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.networkmanager.global_networks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>global_networks_list_only</code> resource, see <a href="/services/networkmanager/global_networks/#permissions"><code>global_networks</code></a>
-
diff --git a/website/docs/services/networkmanager/index.md b/website/docs/services/networkmanager/index.md
index 16bbb5144..3d8c38da0 100644
--- a/website/docs/services/networkmanager/index.md
+++ b/website/docs/services/networkmanager/index.md
@@ -20,7 +20,7 @@ The networkmanager service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>30</b></span><br />
+<span>total resources:&nbsp;<b>15</b></span><br />
 </div>
 </div>
 
@@ -30,36 +30,21 @@ The networkmanager service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/networkmanager/connect_attachments/">connect_attachments</a><br />
-<a href="/services/networkmanager/connect_attachments_list_only/">connect_attachments_list_only</a><br />
 <a href="/services/networkmanager/connect_peers/">connect_peers</a><br />
-<a href="/services/networkmanager/connect_peers_list_only/">connect_peers_list_only</a><br />
 <a href="/services/networkmanager/core_networks/">core_networks</a><br />
-<a href="/services/networkmanager/core_networks_list_only/">core_networks_list_only</a><br />
 <a href="/services/networkmanager/customer_gateway_associations/">customer_gateway_associations</a><br />
-<a href="/services/networkmanager/customer_gateway_associations_list_only/">customer_gateway_associations_list_only</a><br />
 <a href="/services/networkmanager/devices/">devices</a><br />
-<a href="/services/networkmanager/devices_list_only/">devices_list_only</a><br />
 <a href="/services/networkmanager/direct_connect_gateway_attachments/">direct_connect_gateway_attachments</a><br />
-<a href="/services/networkmanager/direct_connect_gateway_attachments_list_only/">direct_connect_gateway_attachments_list_only</a><br />
 <a href="/services/networkmanager/global_networks/">global_networks</a><br />
-<a href="/services/networkmanager/global_networks_list_only/">global_networks_list_only</a><br />
 <a href="/services/networkmanager/link_associations/">link_associations</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/networkmanager/link_associations_list_only/">link_associations_list_only</a><br />
 <a href="/services/networkmanager/links/">links</a><br />
-<a href="/services/networkmanager/links_list_only/">links_list_only</a><br />
 <a href="/services/networkmanager/site_to_site_vpn_attachments/">site_to_site_vpn_attachments</a><br />
-<a href="/services/networkmanager/site_to_site_vpn_attachments_list_only/">site_to_site_vpn_attachments_list_only</a><br />
 <a href="/services/networkmanager/sites/">sites</a><br />
-<a href="/services/networkmanager/sites_list_only/">sites_list_only</a><br />
 <a href="/services/networkmanager/transit_gateway_peerings/">transit_gateway_peerings</a><br />
-<a href="/services/networkmanager/transit_gateway_peerings_list_only/">transit_gateway_peerings_list_only</a><br />
 <a href="/services/networkmanager/transit_gateway_registrations/">transit_gateway_registrations</a><br />
-<a href="/services/networkmanager/transit_gateway_registrations_list_only/">transit_gateway_registrations_list_only</a><br />
 <a href="/services/networkmanager/transit_gateway_route_table_attachments/">transit_gateway_route_table_attachments</a><br />
-<a href="/services/networkmanager/transit_gateway_route_table_attachments_list_only/">transit_gateway_route_table_attachments_list_only</a><br />
-<a href="/services/networkmanager/vpc_attachments/">vpc_attachments</a><br />
-<a href="/services/networkmanager/vpc_attachments_list_only/">vpc_attachments_list_only</a>
+<a href="/services/networkmanager/vpc_attachments/">vpc_attachments</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/networkmanager/link_associations/index.md b/website/docs/services/networkmanager/link_associations/index.md
index 6b439952a..2e0ad2550 100644
--- a/website/docs/services/networkmanager/link_associations/index.md
+++ b/website/docs/services/networkmanager/link_associations/index.md
@@ -33,6 +33,40 @@ Creates, updates, deletes or gets a <code>link_association</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "global_network_id",
+    "type": "string",
+    "description": "The ID of the global network."
+  },
+  {
+    "name": "device_id",
+    "type": "string",
+    "description": "The ID of the device"
+  },
+  {
+    "name": "link_id",
+    "type": "string",
+    "description": "The ID of the link"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "global_network_id",
@@ -55,6 +89,8 @@ Creates, updates, deletes or gets a <code>link_association</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-linkassociation.html"><code>AWS::NetworkManager::LinkAssociation</code></a>.
 
@@ -64,26 +100,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>link_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GlobalNetworkId, DeviceId, LinkId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>link_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>link_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>link_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +133,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>link_association</code>.
 ```sql
 SELECT
@@ -102,6 +152,21 @@ link_id
 FROM awscc.networkmanager.link_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<GlobalNetworkId>|<DeviceId>|<LinkId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>link_associations</code> in a region.
+```sql
+SELECT
+region,
+global_network_id,
+device_id,
+link_id
+FROM awscc.networkmanager.link_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -174,6 +239,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkmanager/link_associations_list_only/index.md b/website/docs/services/networkmanager/link_associations_list_only/index.md
deleted file mode 100644
index 3ac9bfb1c..000000000
--- a/website/docs/services/networkmanager/link_associations_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: link_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - link_associations_list_only
-  - networkmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>link_associations</code> in a region or regions, for all properties use <a href="/services/networkmanager/link_associations/"><code>link_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>link_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::NetworkManager::LinkAssociation type associates a link to a device. The device and link must be in the same global network and the same site.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkmanager.link_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "global_network_id",
-    "type": "string",
-    "description": "The ID of the global network."
-  },
-  {
-    "name": "device_id",
-    "type": "string",
-    "description": "The ID of the device"
-  },
-  {
-    "name": "link_id",
-    "type": "string",
-    "description": "The ID of the link"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>link_associations</code> in a region.
-```sql
-SELECT
-region,
-global_network_id,
-device_id,
-link_id
-FROM awscc.networkmanager.link_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>link_associations_list_only</code> resource, see <a href="/services/networkmanager/link_associations/#permissions"><code>link_associations</code></a>
-
diff --git a/website/docs/services/networkmanager/links/index.md b/website/docs/services/networkmanager/links/index.md
index 1d973e882..1b1179b07 100644
--- a/website/docs/services/networkmanager/links/index.md
+++ b/website/docs/services/networkmanager/links/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>link</code> resource or lists <code>li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "link_arn",
@@ -119,6 +128,28 @@ Creates, updates, deletes or gets a <code>link</code> resource or lists <code>li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "link_id",
+    "type": "string",
+    "description": "The ID of the link."
+  },
+  {
+    "name": "global_network_id",
+    "type": "string",
+    "description": "The ID of the global network."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-link.html"><code>AWS::NetworkManager::Link</code></a>.
 
@@ -128,31 +159,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>links</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GlobalNetworkId, SiteId, Bandwidth, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>links</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>links</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>links_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>links</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +198,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>link</code>.
 ```sql
 SELECT
@@ -179,6 +225,20 @@ state
 FROM awscc.networkmanager.links
 WHERE region = 'us-east-1' AND data__Identifier = '<GlobalNetworkId>|<LinkId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>links</code> in a region.
+```sql
+SELECT
+region,
+global_network_id,
+link_id
+FROM awscc.networkmanager.links_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -271,6 +331,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkmanager.links
+SET data__PatchDocument = string('{{ {
+    "Bandwidth": bandwidth,
+    "Provider": provider,
+    "Description": description,
+    "Tags": tags,
+    "Type": type
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<GlobalNetworkId>|<LinkId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkmanager/links_list_only/index.md b/website/docs/services/networkmanager/links_list_only/index.md
deleted file mode 100644
index 60234208b..000000000
--- a/website/docs/services/networkmanager/links_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: links_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - links_list_only
-  - networkmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>links</code> in a region or regions, for all properties use <a href="/services/networkmanager/links/"><code>links</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>links_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::NetworkManager::Link type describes a link.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkmanager.links_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "link_id",
-    "type": "string",
-    "description": "The ID of the link."
-  },
-  {
-    "name": "global_network_id",
-    "type": "string",
-    "description": "The ID of the global network."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>links</code> in a region.
-```sql
-SELECT
-region,
-global_network_id,
-link_id
-FROM awscc.networkmanager.links_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>links_list_only</code> resource, see <a href="/services/networkmanager/links/#permissions"><code>links</code></a>
-
diff --git a/website/docs/services/networkmanager/site_to_site_vpn_attachments/index.md b/website/docs/services/networkmanager/site_to_site_vpn_attachments/index.md
index 095174aa6..ff0929862 100644
--- a/website/docs/services/networkmanager/site_to_site_vpn_attachments/index.md
+++ b/website/docs/services/networkmanager/site_to_site_vpn_attachments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>site_to_site_vpn_attachment</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "core_network_id",
@@ -195,6 +204,23 @@ Creates, updates, deletes or gets a <code>site_to_site_vpn_attachment</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "attachment_id",
+    "type": "string",
+    "description": "The ID of the attachment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-sitetositevpnattachment.html"><code>AWS::NetworkManager::SiteToSiteVpnAttachment</code></a>.
 
@@ -204,31 +230,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>site_to_site_vpn_attachments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CoreNetworkId, VpnConnectionArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>site_to_site_vpn_attachments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>site_to_site_vpn_attachments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>site_to_site_vpn_attachments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>site_to_site_vpn_attachments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -237,6 +269,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>site_to_site_vpn_attachment</code>.
 ```sql
 SELECT
@@ -261,6 +302,19 @@ vpn_connection_arn
 FROM awscc.networkmanager.site_to_site_vpn_attachments
 WHERE region = 'us-east-1' AND data__Identifier = '<AttachmentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>site_to_site_vpn_attachments</code> in a region.
+```sql
+SELECT
+region,
+attachment_id
+FROM awscc.networkmanager.site_to_site_vpn_attachments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -353,6 +407,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkmanager.site_to_site_vpn_attachments
+SET data__PatchDocument = string('{{ {
+    "ProposedSegmentChange": proposed_segment_change,
+    "NetworkFunctionGroupName": network_function_group_name,
+    "ProposedNetworkFunctionGroupChange": proposed_network_function_group_change,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AttachmentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkmanager/site_to_site_vpn_attachments_list_only/index.md b/website/docs/services/networkmanager/site_to_site_vpn_attachments_list_only/index.md
deleted file mode 100644
index 46d1ffdca..000000000
--- a/website/docs/services/networkmanager/site_to_site_vpn_attachments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: site_to_site_vpn_attachments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - site_to_site_vpn_attachments_list_only
-  - networkmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>site_to_site_vpn_attachments</code> in a region or regions, for all properties use <a href="/services/networkmanager/site_to_site_vpn_attachments/"><code>site_to_site_vpn_attachments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>site_to_site_vpn_attachments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::NetworkManager::SiteToSiteVpnAttachment Resource Type definition.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkmanager.site_to_site_vpn_attachments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "attachment_id",
-    "type": "string",
-    "description": "The ID of the attachment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>site_to_site_vpn_attachments</code> in a region.
-```sql
-SELECT
-region,
-attachment_id
-FROM awscc.networkmanager.site_to_site_vpn_attachments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>site_to_site_vpn_attachments_list_only</code> resource, see <a href="/services/networkmanager/site_to_site_vpn_attachments/#permissions"><code>site_to_site_vpn_attachments</code></a>
-
diff --git a/website/docs/services/networkmanager/sites/index.md b/website/docs/services/networkmanager/sites/index.md
index 85e12c8f0..2ff79c25a 100644
--- a/website/docs/services/networkmanager/sites/index.md
+++ b/website/docs/services/networkmanager/sites/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>site</code> resource or lists <code>si
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "site_arn",
@@ -109,6 +118,28 @@ Creates, updates, deletes or gets a <code>site</code> resource or lists <code>si
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "site_id",
+    "type": "string",
+    "description": "The ID of the site."
+  },
+  {
+    "name": "global_network_id",
+    "type": "string",
+    "description": "The ID of the global network."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-site.html"><code>AWS::NetworkManager::Site</code></a>.
 
@@ -118,31 +149,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>sites</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GlobalNetworkId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>sites</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>sites</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>sites_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>sites</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +188,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>site</code>.
 ```sql
 SELECT
@@ -166,6 +212,20 @@ state
 FROM awscc.networkmanager.sites
 WHERE region = 'us-east-1' AND data__Identifier = '<GlobalNetworkId>|<SiteId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>sites</code> in a region.
+```sql
+SELECT
+region,
+global_network_id,
+site_id
+FROM awscc.networkmanager.sites_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -243,6 +303,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkmanager.sites
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags,
+    "Location": location
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<GlobalNetworkId>|<SiteId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkmanager/sites_list_only/index.md b/website/docs/services/networkmanager/sites_list_only/index.md
deleted file mode 100644
index 3ee9115a4..000000000
--- a/website/docs/services/networkmanager/sites_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: sites_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - sites_list_only
-  - networkmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>sites</code> in a region or regions, for all properties use <a href="/services/networkmanager/sites/"><code>sites</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>sites_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::NetworkManager::Site type describes a site.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkmanager.sites_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "site_id",
-    "type": "string",
-    "description": "The ID of the site."
-  },
-  {
-    "name": "global_network_id",
-    "type": "string",
-    "description": "The ID of the global network."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>sites</code> in a region.
-```sql
-SELECT
-region,
-global_network_id,
-site_id
-FROM awscc.networkmanager.sites_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>sites_list_only</code> resource, see <a href="/services/networkmanager/sites/#permissions"><code>sites</code></a>
-
diff --git a/website/docs/services/networkmanager/transit_gateway_peerings/index.md b/website/docs/services/networkmanager/transit_gateway_peerings/index.md
index 196aa71f5..2d5b9c04b 100644
--- a/website/docs/services/networkmanager/transit_gateway_peerings/index.md
+++ b/website/docs/services/networkmanager/transit_gateway_peerings/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transit_gateway_peering</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "core_network_id",
@@ -112,6 +121,23 @@ Creates, updates, deletes or gets a <code>transit_gateway_peering</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "peering_id",
+    "type": "string",
+    "description": "The Id of the transit gateway peering"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-transitgatewaypeering.html"><code>AWS::NetworkManager::TransitGatewayPeering</code></a>.
 
@@ -121,31 +147,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_peerings</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CoreNetworkId, TransitGatewayArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_peerings</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>transit_gateway_peerings</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_peerings_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_peerings</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -154,6 +186,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_peering</code>.
 ```sql
 SELECT
@@ -173,6 +214,19 @@ tags
 FROM awscc.networkmanager.transit_gateway_peerings
 WHERE region = 'us-east-1' AND data__Identifier = '<PeeringId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_peerings</code> in a region.
+```sql
+SELECT
+region,
+peering_id
+FROM awscc.networkmanager.transit_gateway_peerings_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -245,6 +299,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkmanager.transit_gateway_peerings
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PeeringId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkmanager/transit_gateway_peerings_list_only/index.md b/website/docs/services/networkmanager/transit_gateway_peerings_list_only/index.md
deleted file mode 100644
index e2efc4105..000000000
--- a/website/docs/services/networkmanager/transit_gateway_peerings_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: transit_gateway_peerings_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_peerings_list_only
-  - networkmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_peerings</code> in a region or regions, for all properties use <a href="/services/networkmanager/transit_gateway_peerings/"><code>transit_gateway_peerings</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_peerings_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::NetworkManager::TransitGatewayPeering Resoruce Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkmanager.transit_gateway_peerings_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "peering_id",
-    "type": "string",
-    "description": "The Id of the transit gateway peering"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_peerings</code> in a region.
-```sql
-SELECT
-region,
-peering_id
-FROM awscc.networkmanager.transit_gateway_peerings_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_peerings_list_only</code> resource, see <a href="/services/networkmanager/transit_gateway_peerings/#permissions"><code>transit_gateway_peerings</code></a>
-
diff --git a/website/docs/services/networkmanager/transit_gateway_registrations/index.md b/website/docs/services/networkmanager/transit_gateway_registrations/index.md
index 3a06db318..d8a2298d2 100644
--- a/website/docs/services/networkmanager/transit_gateway_registrations/index.md
+++ b/website/docs/services/networkmanager/transit_gateway_registrations/index.md
@@ -33,6 +33,35 @@ Creates, updates, deletes or gets a <code>transit_gateway_registration</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "global_network_id",
+    "type": "string",
+    "description": "The ID of the global network."
+  },
+  {
+    "name": "transit_gateway_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the transit gateway."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "global_network_id",
@@ -50,6 +79,8 @@ Creates, updates, deletes or gets a <code>transit_gateway_registration</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-transitgatewayregistration.html"><code>AWS::NetworkManager::TransitGatewayRegistration</code></a>.
 
@@ -59,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_registrations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GlobalNetworkId, TransitGatewayArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_registrations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_registrations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_registrations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_registration</code>.
 ```sql
 SELECT
@@ -96,6 +141,20 @@ transit_gateway_arn
 FROM awscc.networkmanager.transit_gateway_registrations
 WHERE region = 'us-east-1' AND data__Identifier = '<GlobalNetworkId>|<TransitGatewayArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_registrations</code> in a region.
+```sql
+SELECT
+region,
+global_network_id,
+transit_gateway_arn
+FROM awscc.networkmanager.transit_gateway_registrations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -162,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkmanager/transit_gateway_registrations_list_only/index.md b/website/docs/services/networkmanager/transit_gateway_registrations_list_only/index.md
deleted file mode 100644
index 2f7755038..000000000
--- a/website/docs/services/networkmanager/transit_gateway_registrations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: transit_gateway_registrations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_registrations_list_only
-  - networkmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_registrations</code> in a region or regions, for all properties use <a href="/services/networkmanager/transit_gateway_registrations/"><code>transit_gateway_registrations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_registrations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::NetworkManager::TransitGatewayRegistration type registers a transit gateway in your global network. The transit gateway can be in any AWS Region, but it must be owned by the same AWS account that owns the global network. You cannot register a transit gateway in more than one global network.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkmanager.transit_gateway_registrations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "global_network_id",
-    "type": "string",
-    "description": "The ID of the global network."
-  },
-  {
-    "name": "transit_gateway_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the transit gateway."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_registrations</code> in a region.
-```sql
-SELECT
-region,
-global_network_id,
-transit_gateway_arn
-FROM awscc.networkmanager.transit_gateway_registrations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_registrations_list_only</code> resource, see <a href="/services/networkmanager/transit_gateway_registrations/#permissions"><code>transit_gateway_registrations</code></a>
-
diff --git a/website/docs/services/networkmanager/transit_gateway_route_table_attachments/index.md b/website/docs/services/networkmanager/transit_gateway_route_table_attachments/index.md
index 8b1453866..d048bed5f 100644
--- a/website/docs/services/networkmanager/transit_gateway_route_table_attachments/index.md
+++ b/website/docs/services/networkmanager/transit_gateway_route_table_attachments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transit_gateway_route_table_attachment
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "peering_id",
@@ -200,6 +209,23 @@ Creates, updates, deletes or gets a <code>transit_gateway_route_table_attachment
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "attachment_id",
+    "type": "string",
+    "description": "The ID of the attachment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-transitgatewayroutetableattachment.html"><code>AWS::NetworkManager::TransitGatewayRouteTableAttachment</code></a>.
 
@@ -209,31 +235,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transit_gateway_route_table_attachments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PeeringId, TransitGatewayRouteTableArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transit_gateway_route_table_attachments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>transit_gateway_route_table_attachments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transit_gateway_route_table_attachments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transit_gateway_route_table_attachments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -242,6 +274,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transit_gateway_route_table_attachment</code>.
 ```sql
 SELECT
@@ -267,6 +308,19 @@ tags
 FROM awscc.networkmanager.transit_gateway_route_table_attachments
 WHERE region = 'us-east-1' AND data__Identifier = '<AttachmentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transit_gateway_route_table_attachments</code> in a region.
+```sql
+SELECT
+region,
+attachment_id
+FROM awscc.networkmanager.transit_gateway_route_table_attachments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -359,6 +413,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkmanager.transit_gateway_route_table_attachments
+SET data__PatchDocument = string('{{ {
+    "ProposedSegmentChange": proposed_segment_change,
+    "NetworkFunctionGroupName": network_function_group_name,
+    "ProposedNetworkFunctionGroupChange": proposed_network_function_group_change,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AttachmentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkmanager/transit_gateway_route_table_attachments_list_only/index.md b/website/docs/services/networkmanager/transit_gateway_route_table_attachments_list_only/index.md
deleted file mode 100644
index cb20c7a39..000000000
--- a/website/docs/services/networkmanager/transit_gateway_route_table_attachments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: transit_gateway_route_table_attachments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transit_gateway_route_table_attachments_list_only
-  - networkmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transit_gateway_route_table_attachments</code> in a region or regions, for all properties use <a href="/services/networkmanager/transit_gateway_route_table_attachments/"><code>transit_gateway_route_table_attachments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transit_gateway_route_table_attachments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::NetworkManager::TransitGatewayRouteTableAttachment Resource Type definition.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkmanager.transit_gateway_route_table_attachments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "attachment_id",
-    "type": "string",
-    "description": "The ID of the attachment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transit_gateway_route_table_attachments</code> in a region.
-```sql
-SELECT
-region,
-attachment_id
-FROM awscc.networkmanager.transit_gateway_route_table_attachments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transit_gateway_route_table_attachments_list_only</code> resource, see <a href="/services/networkmanager/transit_gateway_route_table_attachments/#permissions"><code>transit_gateway_route_table_attachments</code></a>
-
diff --git a/website/docs/services/networkmanager/vpc_attachments/index.md b/website/docs/services/networkmanager/vpc_attachments/index.md
index a78504772..1bd62a881 100644
--- a/website/docs/services/networkmanager/vpc_attachments/index.md
+++ b/website/docs/services/networkmanager/vpc_attachments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_attachment</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "core_network_id",
@@ -227,6 +236,23 @@ Creates, updates, deletes or gets a <code>vpc_attachment</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "attachment_id",
+    "type": "string",
+    "description": "Id of the attachment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-vpcattachment.html"><code>AWS::NetworkManager::VpcAttachment</code></a>.
 
@@ -236,31 +262,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_attachments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CoreNetworkId, VpcArn, SubnetArns, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_attachments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_attachments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_attachments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_attachments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -269,6 +301,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_attachment</code>.
 ```sql
 SELECT
@@ -295,6 +336,19 @@ options
 FROM awscc.networkmanager.vpc_attachments
 WHERE region = 'us-east-1' AND data__Identifier = '<AttachmentId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_attachments</code> in a region.
+```sql
+SELECT
+region,
+attachment_id
+FROM awscc.networkmanager.vpc_attachments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -398,6 +452,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.networkmanager.vpc_attachments
+SET data__PatchDocument = string('{{ {
+    "ProposedSegmentChange": proposed_segment_change,
+    "ProposedNetworkFunctionGroupChange": proposed_network_function_group_change,
+    "Tags": tags,
+    "SubnetArns": subnet_arns,
+    "Options": options
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AttachmentId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/networkmanager/vpc_attachments_list_only/index.md b/website/docs/services/networkmanager/vpc_attachments_list_only/index.md
deleted file mode 100644
index 60b6dd7aa..000000000
--- a/website/docs/services/networkmanager/vpc_attachments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpc_attachments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_attachments_list_only
-  - networkmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_attachments</code> in a region or regions, for all properties use <a href="/services/networkmanager/vpc_attachments/"><code>vpc_attachments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_attachments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::NetworkManager::VpcAttachment Resoruce Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.networkmanager.vpc_attachments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "attachment_id",
-    "type": "string",
-    "description": "Id of the attachment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_attachments</code> in a region.
-```sql
-SELECT
-region,
-attachment_id
-FROM awscc.networkmanager.vpc_attachments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_attachments_list_only</code> resource, see <a href="/services/networkmanager/vpc_attachments/#permissions"><code>vpc_attachments</code></a>
-
diff --git a/website/docs/services/notifications/channel_associations/index.md b/website/docs/services/notifications/channel_associations/index.md
index 2b02eb95f..8a5a39ece 100644
--- a/website/docs/services/notifications/channel_associations/index.md
+++ b/website/docs/services/notifications/channel_associations/index.md
@@ -33,6 +33,35 @@ Creates, updates, deletes or gets a <code>channel_association</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "ARN identifier of the channel.<br />Example: arn:aws:chatbot::123456789012:chat-configuration/slack-channel/security-ops"
+  },
+  {
+    "name": "notification_configuration_arn",
+    "type": "string",
+    "description": "ARN identifier of the NotificationConfiguration.<br />Example: arn:aws:notifications::123456789012:configuration/a01jes88qxwkbj05xv9c967pgm1"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -50,6 +79,8 @@ Creates, updates, deletes or gets a <code>channel_association</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-notifications-channelassociation.html"><code>AWS::Notifications::ChannelAssociation</code></a>.
 
@@ -59,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>channel_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Arn, NotificationConfigurationArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>channel_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>channel_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>channel_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>channel_association</code>.
 ```sql
 SELECT
@@ -96,6 +141,20 @@ notification_configuration_arn
 FROM awscc.notifications.channel_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>|<NotificationConfigurationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>channel_associations</code> in a region.
+```sql
+SELECT
+region,
+arn,
+notification_configuration_arn
+FROM awscc.notifications.channel_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -162,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/notifications/channel_associations_list_only/index.md b/website/docs/services/notifications/channel_associations_list_only/index.md
deleted file mode 100644
index ddd9ad751..000000000
--- a/website/docs/services/notifications/channel_associations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: channel_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - channel_associations_list_only
-  - notifications
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>channel_associations</code> in a region or regions, for all properties use <a href="/services/notifications/channel_associations/"><code>channel_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>channel_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Notifications::ChannelAssociation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.notifications.channel_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "ARN identifier of the channel.<br />Example: arn:aws:chatbot::123456789012:chat-configuration/slack-channel/security-ops"
-  },
-  {
-    "name": "notification_configuration_arn",
-    "type": "string",
-    "description": "ARN identifier of the NotificationConfiguration.<br />Example: arn:aws:notifications::123456789012:configuration/a01jes88qxwkbj05xv9c967pgm1"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>channel_associations</code> in a region.
-```sql
-SELECT
-region,
-arn,
-notification_configuration_arn
-FROM awscc.notifications.channel_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>channel_associations_list_only</code> resource, see <a href="/services/notifications/channel_associations/#permissions"><code>channel_associations</code></a>
-
diff --git a/website/docs/services/notifications/event_rules/index.md b/website/docs/services/notifications/event_rules/index.md
index 2462be4e2..b5b14aa89 100644
--- a/website/docs/services/notifications/event_rules/index.md
+++ b/website/docs/services/notifications/event_rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>event_rule</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -85,6 +94,23 @@ Creates, updates, deletes or gets an <code>event_rule</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-notifications-eventrule.html"><code>AWS::Notifications::EventRule</code></a>.
 
@@ -94,31 +120,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>event_rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EventType, NotificationConfigurationArn, Regions, Source, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>event_rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>event_rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>event_rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>event_rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -127,6 +159,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>event_rule</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ status_summary_by_region
 FROM awscc.notifications.event_rules
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>event_rules</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.notifications.event_rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -226,6 +280,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.notifications.event_rules
+SET data__PatchDocument = string('{{ {
+    "EventPattern": event_pattern,
+    "Regions": regions
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/notifications/event_rules_list_only/index.md b/website/docs/services/notifications/event_rules_list_only/index.md
deleted file mode 100644
index ff7237a18..000000000
--- a/website/docs/services/notifications/event_rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: event_rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - event_rules_list_only
-  - notifications
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>event_rules</code> in a region or regions, for all properties use <a href="/services/notifications/event_rules/"><code>event_rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>event_rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Notifications::EventRule</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.notifications.event_rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>event_rules</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.notifications.event_rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>event_rules_list_only</code> resource, see <a href="/services/notifications/event_rules/#permissions"><code>event_rules</code></a>
-
diff --git a/website/docs/services/notifications/index.md b/website/docs/services/notifications/index.md
index 318d5920d..1a43fce02 100644
--- a/website/docs/services/notifications/index.md
+++ b/website/docs/services/notifications/index.md
@@ -20,7 +20,7 @@ The notifications service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>14</b></span><br />
+<span>total resources:&nbsp;<b>7</b></span><br />
 </div>
 </div>
 
@@ -30,20 +30,13 @@ The notifications service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/notifications/channel_associations/">channel_associations</a><br />
-<a href="/services/notifications/channel_associations_list_only/">channel_associations_list_only</a><br />
 <a href="/services/notifications/event_rules/">event_rules</a><br />
-<a href="/services/notifications/event_rules_list_only/">event_rules_list_only</a><br />
 <a href="/services/notifications/managed_notification_account_contact_associations/">managed_notification_account_contact_associations</a><br />
-<a href="/services/notifications/managed_notification_account_contact_associations_list_only/">managed_notification_account_contact_associations_list_only</a><br />
 <a href="/services/notifications/managed_notification_additional_channel_associations/">managed_notification_additional_channel_associations</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/notifications/managed_notification_additional_channel_associations_list_only/">managed_notification_additional_channel_associations_list_only</a><br />
 <a href="/services/notifications/notification_configurations/">notification_configurations</a><br />
-<a href="/services/notifications/notification_configurations_list_only/">notification_configurations_list_only</a><br />
 <a href="/services/notifications/notification_hubs/">notification_hubs</a><br />
-<a href="/services/notifications/notification_hubs_list_only/">notification_hubs_list_only</a><br />
-<a href="/services/notifications/organizational_unit_associations/">organizational_unit_associations</a><br />
-<a href="/services/notifications/organizational_unit_associations_list_only/">organizational_unit_associations_list_only</a>
+<a href="/services/notifications/organizational_unit_associations/">organizational_unit_associations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/notifications/managed_notification_account_contact_associations/index.md b/website/docs/services/notifications/managed_notification_account_contact_associations/index.md
index a83dd6542..15ae8d28d 100644
--- a/website/docs/services/notifications/managed_notification_account_contact_associations/index.md
+++ b/website/docs/services/notifications/managed_notification_account_contact_associations/index.md
@@ -33,6 +33,35 @@ Creates, updates, deletes or gets a <code>managed_notification_account_contact_a
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "managed_notification_configuration_arn",
+    "type": "string",
+    "description": "The managed notification configuration ARN, against which the account contact association will be created"
+  },
+  {
+    "name": "contact_identifier",
+    "type": "string",
+    "description": "This unique identifier for Contact"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "managed_notification_configuration_arn",
@@ -50,6 +79,8 @@ Creates, updates, deletes or gets a <code>managed_notification_account_contact_a
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-notifications-managednotificationaccountcontactassociation.html"><code>AWS::Notifications::ManagedNotificationAccountContactAssociation</code></a>.
 
@@ -59,31 +90,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>managed_notification_account_contact_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ContactIdentifier, ManagedNotificationConfigurationArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>managed_notification_account_contact_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>managed_notification_account_contact_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>managed_notification_account_contact_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>managed_notification_account_contact_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +129,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>managed_notification_account_contact_association</code>.
 ```sql
 SELECT
@@ -101,6 +147,20 @@ contact_identifier
 FROM awscc.notifications.managed_notification_account_contact_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<ManagedNotificationConfigurationArn>|<ContactIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>managed_notification_account_contact_associations</code> in a region.
+```sql
+SELECT
+region,
+managed_notification_configuration_arn,
+contact_identifier
+FROM awscc.notifications.managed_notification_account_contact_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -167,6 +227,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/notifications/managed_notification_account_contact_associations_list_only/index.md b/website/docs/services/notifications/managed_notification_account_contact_associations_list_only/index.md
deleted file mode 100644
index e03c29b60..000000000
--- a/website/docs/services/notifications/managed_notification_account_contact_associations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: managed_notification_account_contact_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - managed_notification_account_contact_associations_list_only
-  - notifications
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>managed_notification_account_contact_associations</code> in a region or regions, for all properties use <a href="/services/notifications/managed_notification_account_contact_associations/"><code>managed_notification_account_contact_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>managed_notification_account_contact_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for ManagedNotificationAccountContactAssociation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.notifications.managed_notification_account_contact_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "managed_notification_configuration_arn",
-    "type": "string",
-    "description": "The managed notification configuration ARN, against which the account contact association will be created"
-  },
-  {
-    "name": "contact_identifier",
-    "type": "string",
-    "description": "This unique identifier for Contact"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>managed_notification_account_contact_associations</code> in a region.
-```sql
-SELECT
-region,
-managed_notification_configuration_arn,
-contact_identifier
-FROM awscc.notifications.managed_notification_account_contact_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>managed_notification_account_contact_associations_list_only</code> resource, see <a href="/services/notifications/managed_notification_account_contact_associations/#permissions"><code>managed_notification_account_contact_associations</code></a>
-
diff --git a/website/docs/services/notifications/managed_notification_additional_channel_associations/index.md b/website/docs/services/notifications/managed_notification_additional_channel_associations/index.md
index 29c7c708c..d48f3f86c 100644
--- a/website/docs/services/notifications/managed_notification_additional_channel_associations/index.md
+++ b/website/docs/services/notifications/managed_notification_additional_channel_associations/index.md
@@ -33,6 +33,35 @@ Creates, updates, deletes or gets a <code>managed_notification_additional_channe
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "channel_arn",
+    "type": "string",
+    "description": "ARN identifier of the channel.<br />Example: arn:aws:chatbot::123456789012:chat-configuration/slack-channel/security-ops"
+  },
+  {
+    "name": "managed_notification_configuration_arn",
+    "type": "string",
+    "description": "ARN identifier of the Managed Notification.<br />Example: arn:aws:notifications::381491923782:managed-notification-configuration/category/AWS-Health/sub-category/Billing"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "channel_arn",
@@ -50,6 +79,8 @@ Creates, updates, deletes or gets a <code>managed_notification_additional_channe
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-notifications-managednotificationadditionalchannelassociation.html"><code>AWS::Notifications::ManagedNotificationAdditionalChannelAssociation</code></a>.
 
@@ -59,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>managed_notification_additional_channel_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ChannelArn, ManagedNotificationConfigurationArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>managed_notification_additional_channel_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>managed_notification_additional_channel_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>managed_notification_additional_channel_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>managed_notification_additional_channel_association</code>.
 ```sql
 SELECT
@@ -96,6 +141,20 @@ managed_notification_configuration_arn
 FROM awscc.notifications.managed_notification_additional_channel_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<ChannelArn>|<ManagedNotificationConfigurationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>managed_notification_additional_channel_associations</code> in a region.
+```sql
+SELECT
+region,
+channel_arn,
+managed_notification_configuration_arn
+FROM awscc.notifications.managed_notification_additional_channel_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -162,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/notifications/managed_notification_additional_channel_associations_list_only/index.md b/website/docs/services/notifications/managed_notification_additional_channel_associations_list_only/index.md
deleted file mode 100644
index 072844af0..000000000
--- a/website/docs/services/notifications/managed_notification_additional_channel_associations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: managed_notification_additional_channel_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - managed_notification_additional_channel_associations_list_only
-  - notifications
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>managed_notification_additional_channel_associations</code> in a region or regions, for all properties use <a href="/services/notifications/managed_notification_additional_channel_associations/"><code>managed_notification_additional_channel_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>managed_notification_additional_channel_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Notifications::ManagedNotificationAdditionalChannelAssociation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.notifications.managed_notification_additional_channel_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "channel_arn",
-    "type": "string",
-    "description": "ARN identifier of the channel.<br />Example: arn:aws:chatbot::123456789012:chat-configuration/slack-channel/security-ops"
-  },
-  {
-    "name": "managed_notification_configuration_arn",
-    "type": "string",
-    "description": "ARN identifier of the Managed Notification.<br />Example: arn:aws:notifications::381491923782:managed-notification-configuration/category/AWS-Health/sub-category/Billing"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>managed_notification_additional_channel_associations</code> in a region.
-```sql
-SELECT
-region,
-channel_arn,
-managed_notification_configuration_arn
-FROM awscc.notifications.managed_notification_additional_channel_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>managed_notification_additional_channel_associations_list_only</code> resource, see <a href="/services/notifications/managed_notification_additional_channel_associations/#permissions"><code>managed_notification_additional_channel_associations</code></a>
-
diff --git a/website/docs/services/notifications/notification_configurations/index.md b/website/docs/services/notifications/notification_configurations/index.md
index 4e6aadf61..361aed6d6 100644
--- a/website/docs/services/notifications/notification_configurations/index.md
+++ b/website/docs/services/notifications/notification_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>notification_configuration</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "aggregation_duration",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>notification_configuration</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-notifications-notificationconfiguration.html"><code>AWS::Notifications::NotificationConfiguration</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>notification_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Description, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>notification_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>notification_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>notification_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>notification_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>notification_configuration</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.notifications.notification_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>notification_configurations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.notifications.notification_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.notifications.notification_configurations
+SET data__PatchDocument = string('{{ {
+    "AggregationDuration": aggregation_duration,
+    "Description": description,
+    "Name": name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/notifications/notification_configurations_list_only/index.md b/website/docs/services/notifications/notification_configurations_list_only/index.md
deleted file mode 100644
index ce0917768..000000000
--- a/website/docs/services/notifications/notification_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: notification_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - notification_configurations_list_only
-  - notifications
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>notification_configurations</code> in a region or regions, for all properties use <a href="/services/notifications/notification_configurations/"><code>notification_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>notification_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Notifications::NotificationConfiguration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.notifications.notification_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>notification_configurations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.notifications.notification_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>notification_configurations_list_only</code> resource, see <a href="/services/notifications/notification_configurations/#permissions"><code>notification_configurations</code></a>
-
diff --git a/website/docs/services/notifications/notification_hubs/index.md b/website/docs/services/notifications/notification_hubs/index.md
index 191d9d7ac..9bfaae690 100644
--- a/website/docs/services/notifications/notification_hubs/index.md
+++ b/website/docs/services/notifications/notification_hubs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>notification_hub</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "region",
@@ -67,6 +76,23 @@ Creates, updates, deletes or gets a <code>notification_hub</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "region",
+    "type": "string",
+    "description": "Region that NotificationHub is present in."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-notifications-notificationhub.html"><code>AWS::Notifications::NotificationHub</code></a>.
 
@@ -76,26 +102,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>notification_hubs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Region, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>notification_hubs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>notification_hubs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>notification_hubs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -104,6 +135,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>notification_hub</code>.
 ```sql
 SELECT
@@ -114,6 +154,19 @@ creation_time
 FROM awscc.notifications.notification_hubs
 WHERE region = 'us-east-1' AND data__Identifier = '<Region>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>notification_hubs</code> in a region.
+```sql
+SELECT
+region,
+region
+FROM awscc.notifications.notification_hubs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -174,6 +227,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/notifications/notification_hubs_list_only/index.md b/website/docs/services/notifications/notification_hubs_list_only/index.md
deleted file mode 100644
index 904e70a64..000000000
--- a/website/docs/services/notifications/notification_hubs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: notification_hubs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - notification_hubs_list_only
-  - notifications
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>notification_hubs</code> in a region or regions, for all properties use <a href="/services/notifications/notification_hubs/"><code>notification_hubs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>notification_hubs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Notifications::NotificationHub</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.notifications.notification_hubs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "region",
-    "type": "string",
-    "description": "Region that NotificationHub is present in."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>notification_hubs</code> in a region.
-```sql
-SELECT
-region,
-region
-FROM awscc.notifications.notification_hubs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>notification_hubs_list_only</code> resource, see <a href="/services/notifications/notification_hubs/#permissions"><code>notification_hubs</code></a>
-
diff --git a/website/docs/services/notifications/organizational_unit_associations/index.md b/website/docs/services/notifications/organizational_unit_associations/index.md
index 7d7dd1fe2..eb3c3de00 100644
--- a/website/docs/services/notifications/organizational_unit_associations/index.md
+++ b/website/docs/services/notifications/organizational_unit_associations/index.md
@@ -33,6 +33,35 @@ Creates, updates, deletes or gets an <code>organizational_unit_association</code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "notification_configuration_arn",
+    "type": "string",
+    "description": "ARN identifier of the NotificationConfiguration.<br />Example: arn:aws:notifications::123456789012:configuration/a01jes88qxwkbj05xv9c967pgm1"
+  },
+  {
+    "name": "organizational_unit_id",
+    "type": "string",
+    "description": "The ID of the organizational unit."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "notification_configuration_arn",
@@ -50,6 +79,8 @@ Creates, updates, deletes or gets an <code>organizational_unit_association</code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-notifications-organizationalunitassociation.html"><code>AWS::Notifications::OrganizationalUnitAssociation</code></a>.
 
@@ -59,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>organizational_unit_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="NotificationConfigurationArn, OrganizationalUnitId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>organizational_unit_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>organizational_unit_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>organizational_unit_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>organizational_unit_association</code>.
 ```sql
 SELECT
@@ -96,6 +141,20 @@ organizational_unit_id
 FROM awscc.notifications.organizational_unit_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<NotificationConfigurationArn>|<OrganizationalUnitId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>organizational_unit_associations</code> in a region.
+```sql
+SELECT
+region,
+notification_configuration_arn,
+organizational_unit_id
+FROM awscc.notifications.organizational_unit_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -162,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/notifications/organizational_unit_associations_list_only/index.md b/website/docs/services/notifications/organizational_unit_associations_list_only/index.md
deleted file mode 100644
index f29c38038..000000000
--- a/website/docs/services/notifications/organizational_unit_associations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: organizational_unit_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - organizational_unit_associations_list_only
-  - notifications
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>organizational_unit_associations</code> in a region or regions, for all properties use <a href="/services/notifications/organizational_unit_associations/"><code>organizational_unit_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>organizational_unit_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Notifications::OrganizationalUnitAssociation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.notifications.organizational_unit_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "notification_configuration_arn",
-    "type": "string",
-    "description": "ARN identifier of the NotificationConfiguration.<br />Example: arn:aws:notifications::123456789012:configuration/a01jes88qxwkbj05xv9c967pgm1"
-  },
-  {
-    "name": "organizational_unit_id",
-    "type": "string",
-    "description": "The ID of the organizational unit."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>organizational_unit_associations</code> in a region.
-```sql
-SELECT
-region,
-notification_configuration_arn,
-organizational_unit_id
-FROM awscc.notifications.organizational_unit_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>organizational_unit_associations_list_only</code> resource, see <a href="/services/notifications/organizational_unit_associations/#permissions"><code>organizational_unit_associations</code></a>
-
diff --git a/website/docs/services/notificationscontacts/email_contacts/index.md b/website/docs/services/notificationscontacts/email_contacts/index.md
index 0b5a8bad6..296f398e0 100644
--- a/website/docs/services/notificationscontacts/email_contacts/index.md
+++ b/website/docs/services/notificationscontacts/email_contacts/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>email_contact</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -111,6 +120,23 @@ Creates, updates, deletes or gets an <code>email_contact</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-notificationscontacts-emailcontact.html"><code>AWS::NotificationsContacts::EmailContact</code></a>.
 
@@ -120,26 +146,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>email_contacts</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EmailAddress, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>email_contacts</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>email_contacts_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>email_contacts</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -148,6 +179,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>email_contact</code>.
 ```sql
 SELECT
@@ -160,6 +200,19 @@ tags
 FROM awscc.notificationscontacts.email_contacts
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>email_contacts</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.notificationscontacts.email_contacts_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -232,6 +285,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/notificationscontacts/email_contacts_list_only/index.md b/website/docs/services/notificationscontacts/email_contacts_list_only/index.md
deleted file mode 100644
index 80d103f28..000000000
--- a/website/docs/services/notificationscontacts/email_contacts_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: email_contacts_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - email_contacts_list_only
-  - notificationscontacts
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>email_contacts</code> in a region or regions, for all properties use <a href="/services/notificationscontacts/email_contacts/"><code>email_contacts</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>email_contacts_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::NotificationsContacts::EmailContact Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.notificationscontacts.email_contacts_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>email_contacts</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.notificationscontacts.email_contacts_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>email_contacts_list_only</code> resource, see <a href="/services/notificationscontacts/email_contacts/#permissions"><code>email_contacts</code></a>
-
diff --git a/website/docs/services/notificationscontacts/index.md b/website/docs/services/notificationscontacts/index.md
index e7452192d..fcb589c2c 100644
--- a/website/docs/services/notificationscontacts/index.md
+++ b/website/docs/services/notificationscontacts/index.md
@@ -20,7 +20,7 @@ The notificationscontacts service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The notificationscontacts service documentation.
 <a href="/services/notificationscontacts/email_contacts/">email_contacts</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/notificationscontacts/email_contacts_list_only/">email_contacts_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/oam/index.md b/website/docs/services/oam/index.md
index 48b98d5f5..7eeebd149 100644
--- a/website/docs/services/oam/index.md
+++ b/website/docs/services/oam/index.md
@@ -20,7 +20,7 @@ The oam service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The oam service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/oam/links/">links</a><br />
-<a href="/services/oam/links_list_only/">links_list_only</a>
+<a href="/services/oam/links/">links</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/oam/sinks/">sinks</a><br />
-<a href="/services/oam/sinks_list_only/">sinks_list_only</a>
+<a href="/services/oam/sinks/">sinks</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/oam/links/index.md b/website/docs/services/oam/links/index.md
index d20babe95..9bb9fe9ff 100644
--- a/website/docs/services/oam/links/index.md
+++ b/website/docs/services/oam/links/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>link</code> resource or lists <code>li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -89,6 +98,23 @@ Creates, updates, deletes or gets a <code>link</code> resource or lists <code>li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-oam-link.html"><code>AWS::Oam::Link</code></a>.
 
@@ -98,31 +124,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>links</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResourceTypes, SinkIdentifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>links</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>links</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>links_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>links</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -131,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>link</code>.
 ```sql
 SELECT
@@ -145,6 +186,19 @@ tags
 FROM awscc.oam.links
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>links</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.oam.links_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -227,6 +281,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.oam.links
+SET data__PatchDocument = string('{{ {
+    "ResourceTypes": resource_types,
+    "LinkConfiguration": link_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/oam/links_list_only/index.md b/website/docs/services/oam/links_list_only/index.md
deleted file mode 100644
index 5f535160b..000000000
--- a/website/docs/services/oam/links_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: links_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - links_list_only
-  - oam
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>links</code> in a region or regions, for all properties use <a href="/services/oam/links/"><code>links</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>links_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Oam::Link Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.oam.links_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>links</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.oam.links_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>links_list_only</code> resource, see <a href="/services/oam/links/#permissions"><code>links</code></a>
-
diff --git a/website/docs/services/oam/sinks/index.md b/website/docs/services/oam/sinks/index.md
index 021361fc0..4d181ba5a 100644
--- a/website/docs/services/oam/sinks/index.md
+++ b/website/docs/services/oam/sinks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>sink</code> resource or lists <code>si
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets a <code>sink</code> resource or lists <code>si
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon resource name (ARN) of the ObservabilityAccessManager Sink"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-oam-sink.html"><code>AWS::Oam::Sink</code></a>.
 
@@ -69,31 +95,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>sinks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>sinks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>sinks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>sinks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>sinks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +134,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>sink</code>.
 ```sql
 SELECT
@@ -113,6 +154,19 @@ tags
 FROM awscc.oam.sinks
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>sinks</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.oam.sinks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -181,6 +235,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.oam.sinks
+SET data__PatchDocument = string('{{ {
+    "Policy": policy,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/oam/sinks_list_only/index.md b/website/docs/services/oam/sinks_list_only/index.md
deleted file mode 100644
index 668fd1a1b..000000000
--- a/website/docs/services/oam/sinks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: sinks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - sinks_list_only
-  - oam
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>sinks</code> in a region or regions, for all properties use <a href="/services/oam/sinks/"><code>sinks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>sinks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Oam::Sink</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.oam.sinks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon resource name (ARN) of the ObservabilityAccessManager Sink"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>sinks</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.oam.sinks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>sinks_list_only</code> resource, see <a href="/services/oam/sinks/#permissions"><code>sinks</code></a>
-
diff --git a/website/docs/services/observabilityadmin/index.md b/website/docs/services/observabilityadmin/index.md
index 1423ae540..87cee45bc 100644
--- a/website/docs/services/observabilityadmin/index.md
+++ b/website/docs/services/observabilityadmin/index.md
@@ -20,7 +20,7 @@ The observabilityadmin service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The observabilityadmin service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/observabilityadmin/organization_telemetry_rules/">organization_telemetry_rules</a><br />
-<a href="/services/observabilityadmin/organization_telemetry_rules_list_only/">organization_telemetry_rules_list_only</a>
+<a href="/services/observabilityadmin/organization_telemetry_rules/">organization_telemetry_rules</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/observabilityadmin/telemetry_rules/">telemetry_rules</a><br />
-<a href="/services/observabilityadmin/telemetry_rules_list_only/">telemetry_rules_list_only</a>
+<a href="/services/observabilityadmin/telemetry_rules/">telemetry_rules</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/observabilityadmin/organization_telemetry_rules/index.md b/website/docs/services/observabilityadmin/organization_telemetry_rules/index.md
index 9c7c44ac8..54bca99f9 100644
--- a/website/docs/services/observabilityadmin/organization_telemetry_rules/index.md
+++ b/website/docs/services/observabilityadmin/organization_telemetry_rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>organization_telemetry_rule</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "rule_name",
@@ -101,6 +110,57 @@ Creates, updates, deletes or gets an <code>organization_telemetry_rule</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "rule",
+    "type": "object",
+    "description": "The AWS::ObservabilityAdmin::TelemetryRule resource defines a CloudWatch Observability Admin Telemetry Rule.",
+    "children": [
+      {
+        "name": "rule_name",
+        "type": "string",
+        "description": "The name of the telemetry rule"
+      },
+      {
+        "name": "rule_arn",
+        "type": "string",
+        "description": "The arn of the telemetry rule"
+      },
+      {
+        "name": "tags",
+        "type": "array",
+        "description": "An array of key-value pairs to apply to this resource",
+        "children": [
+          {
+            "name": "key",
+            "type": "string",
+            "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, &#95;, ., /, =, +, and -."
+          },
+          {
+            "name": "value",
+            "type": "string",
+            "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, &#95;, ., /, =, +, and -."
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "rule_arn",
+    "type": "string",
+    "description": "The arn of the organization telemetry rule"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-observabilityadmin-organizationtelemetryrule.html"><code>AWS::ObservabilityAdmin::OrganizationTelemetryRule</code></a>.
 
@@ -110,31 +170,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>organization_telemetry_rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RuleName, Rule, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>organization_telemetry_rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>organization_telemetry_rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>organization_telemetry_rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>organization_telemetry_rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -143,6 +209,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>organization_telemetry_rule</code>.
 ```sql
 SELECT
@@ -154,6 +229,19 @@ tags
 FROM awscc.observabilityadmin.organization_telemetry_rules
 WHERE region = 'us-east-1' AND data__Identifier = '<RuleArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>organization_telemetry_rules</code> in a region.
+```sql
+SELECT
+region,
+rule_arn
+FROM awscc.observabilityadmin.organization_telemetry_rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -230,6 +318,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.observabilityadmin.organization_telemetry_rules
+SET data__PatchDocument = string('{{ {
+    "Rule": rule,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RuleArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/observabilityadmin/organization_telemetry_rules_list_only/index.md b/website/docs/services/observabilityadmin/organization_telemetry_rules_list_only/index.md
deleted file mode 100644
index 021ad8043..000000000
--- a/website/docs/services/observabilityadmin/organization_telemetry_rules_list_only/index.md
+++ /dev/null
@@ -1,114 +0,0 @@
----
-title: organization_telemetry_rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - organization_telemetry_rules_list_only
-  - observabilityadmin
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>organization_telemetry_rules</code> in a region or regions, for all properties use <a href="/services/observabilityadmin/organization_telemetry_rules/"><code>organization_telemetry_rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>organization_telemetry_rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::ObservabilityAdmin::OrganizationTelemetryRule resource defines a CloudWatch Observability Admin Organization Telemetry Rule.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.observabilityadmin.organization_telemetry_rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "rule",
-    "type": "object",
-    "description": "The AWS::ObservabilityAdmin::TelemetryRule resource defines a CloudWatch Observability Admin Telemetry Rule.",
-    "children": [
-      {
-        "name": "rule_name",
-        "type": "string",
-        "description": "The name of the telemetry rule"
-      },
-      {
-        "name": "rule_arn",
-        "type": "string",
-        "description": "The arn of the telemetry rule"
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "An array of key-value pairs to apply to this resource",
-        "children": [
-          {
-            "name": "key",
-            "type": "string",
-            "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, &#95;, ., /, =, +, and -."
-          },
-          {
-            "name": "value",
-            "type": "string",
-            "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, &#95;, ., /, =, +, and -."
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "rule_arn",
-    "type": "string",
-    "description": "The arn of the organization telemetry rule"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>organization_telemetry_rules</code> in a region.
-```sql
-SELECT
-region,
-rule_arn
-FROM awscc.observabilityadmin.organization_telemetry_rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>organization_telemetry_rules_list_only</code> resource, see <a href="/services/observabilityadmin/organization_telemetry_rules/#permissions"><code>organization_telemetry_rules</code></a>
-
diff --git a/website/docs/services/observabilityadmin/telemetry_rules/index.md b/website/docs/services/observabilityadmin/telemetry_rules/index.md
index 45fd58e18..27945e021 100644
--- a/website/docs/services/observabilityadmin/telemetry_rules/index.md
+++ b/website/docs/services/observabilityadmin/telemetry_rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>telemetry_rule</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "rule_name",
@@ -101,6 +110,57 @@ Creates, updates, deletes or gets a <code>telemetry_rule</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "rule",
+    "type": "object",
+    "description": "The AWS::ObservabilityAdmin::TelemetryRule resource defines a CloudWatch Observability Admin Telemetry Rule.",
+    "children": [
+      {
+        "name": "rule_name",
+        "type": "string",
+        "description": "The name of the telemetry rule"
+      },
+      {
+        "name": "rule_arn",
+        "type": "string",
+        "description": "The arn of the telemetry rule"
+      },
+      {
+        "name": "tags",
+        "type": "array",
+        "description": "An array of key-value pairs to apply to this resource",
+        "children": [
+          {
+            "name": "key",
+            "type": "string",
+            "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, &#95;, ., /, =, +, and -."
+          },
+          {
+            "name": "value",
+            "type": "string",
+            "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, &#95;, ., /, =, +, and -."
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "rule_arn",
+    "type": "string",
+    "description": "The arn of the telemetry rule"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-observabilityadmin-telemetryrule.html"><code>AWS::ObservabilityAdmin::TelemetryRule</code></a>.
 
@@ -110,31 +170,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>telemetry_rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RuleName, Rule, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>telemetry_rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>telemetry_rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>telemetry_rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>telemetry_rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -143,6 +209,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>telemetry_rule</code>.
 ```sql
 SELECT
@@ -154,6 +229,19 @@ tags
 FROM awscc.observabilityadmin.telemetry_rules
 WHERE region = 'us-east-1' AND data__Identifier = '<RuleArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>telemetry_rules</code> in a region.
+```sql
+SELECT
+region,
+rule_arn
+FROM awscc.observabilityadmin.telemetry_rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -230,6 +318,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.observabilityadmin.telemetry_rules
+SET data__PatchDocument = string('{{ {
+    "Rule": rule,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RuleArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/observabilityadmin/telemetry_rules_list_only/index.md b/website/docs/services/observabilityadmin/telemetry_rules_list_only/index.md
deleted file mode 100644
index 198e4e882..000000000
--- a/website/docs/services/observabilityadmin/telemetry_rules_list_only/index.md
+++ /dev/null
@@ -1,114 +0,0 @@
----
-title: telemetry_rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - telemetry_rules_list_only
-  - observabilityadmin
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>telemetry_rules</code> in a region or regions, for all properties use <a href="/services/observabilityadmin/telemetry_rules/"><code>telemetry_rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>telemetry_rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::ObservabilityAdmin::TelemetryRule resource defines a CloudWatch Observability Admin Telemetry Rule.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.observabilityadmin.telemetry_rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "rule",
-    "type": "object",
-    "description": "The AWS::ObservabilityAdmin::TelemetryRule resource defines a CloudWatch Observability Admin Telemetry Rule.",
-    "children": [
-      {
-        "name": "rule_name",
-        "type": "string",
-        "description": "The name of the telemetry rule"
-      },
-      {
-        "name": "rule_arn",
-        "type": "string",
-        "description": "The arn of the telemetry rule"
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "An array of key-value pairs to apply to this resource",
-        "children": [
-          {
-            "name": "key",
-            "type": "string",
-            "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, &#95;, ., /, =, +, and -."
-          },
-          {
-            "name": "value",
-            "type": "string",
-            "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, &#95;, ., /, =, +, and -."
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "rule_arn",
-    "type": "string",
-    "description": "The arn of the telemetry rule"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>telemetry_rules</code> in a region.
-```sql
-SELECT
-region,
-rule_arn
-FROM awscc.observabilityadmin.telemetry_rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>telemetry_rules_list_only</code> resource, see <a href="/services/observabilityadmin/telemetry_rules/#permissions"><code>telemetry_rules</code></a>
-
diff --git a/website/docs/services/odb/cloud_autonomous_vm_clusters/index.md b/website/docs/services/odb/cloud_autonomous_vm_clusters/index.md
index 18b006808..49b612a56 100644
--- a/website/docs/services/odb/cloud_autonomous_vm_clusters/index.md
+++ b/website/docs/services/odb/cloud_autonomous_vm_clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cloud_autonomous_vm_cluster</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cloud_autonomous_vm_cluster_id",
@@ -304,6 +313,23 @@ Creates, updates, deletes or gets a <code>cloud_autonomous_vm_cluster</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cloud_autonomous_vm_cluster_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) for the Autonomous VM cluster."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-odb-cloudautonomousvmcluster.html"><code>AWS::ODB::CloudAutonomousVmCluster</code></a>.
 
@@ -313,31 +339,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cloud_autonomous_vm_clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cloud_autonomous_vm_clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cloud_autonomous_vm_clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cloud_autonomous_vm_clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cloud_autonomous_vm_clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -346,6 +378,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cloud_autonomous_vm_cluster</code>.
 ```sql
 SELECT
@@ -397,6 +438,19 @@ total_container_databases
 FROM awscc.odb.cloud_autonomous_vm_clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<CloudAutonomousVmClusterArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cloud_autonomous_vm_clusters</code> in a region.
+```sql
+SELECT
+region,
+cloud_autonomous_vm_cluster_arn
+FROM awscc.odb.cloud_autonomous_vm_clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -560,6 +614,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.odb.cloud_autonomous_vm_clusters
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CloudAutonomousVmClusterArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/odb/cloud_autonomous_vm_clusters_list_only/index.md b/website/docs/services/odb/cloud_autonomous_vm_clusters_list_only/index.md
deleted file mode 100644
index 5f384a401..000000000
--- a/website/docs/services/odb/cloud_autonomous_vm_clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: cloud_autonomous_vm_clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cloud_autonomous_vm_clusters_list_only
-  - odb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cloud_autonomous_vm_clusters</code> in a region or regions, for all properties use <a href="/services/odb/cloud_autonomous_vm_clusters/"><code>cloud_autonomous_vm_clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cloud_autonomous_vm_clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::ODB::CloudAutonomousVmCluster resource creates a Cloud Autonomous VM Cluster</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.odb.cloud_autonomous_vm_clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cloud_autonomous_vm_cluster_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) for the Autonomous VM cluster."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cloud_autonomous_vm_clusters</code> in a region.
-```sql
-SELECT
-region,
-cloud_autonomous_vm_cluster_arn
-FROM awscc.odb.cloud_autonomous_vm_clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cloud_autonomous_vm_clusters_list_only</code> resource, see <a href="/services/odb/cloud_autonomous_vm_clusters/#permissions"><code>cloud_autonomous_vm_clusters</code></a>
-
diff --git a/website/docs/services/odb/cloud_exadata_infrastructures/index.md b/website/docs/services/odb/cloud_exadata_infrastructures/index.md
index 62fe1c462..53a73c356 100644
--- a/website/docs/services/odb/cloud_exadata_infrastructures/index.md
+++ b/website/docs/services/odb/cloud_exadata_infrastructures/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cloud_exadata_infrastructure</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "activated_storage_count",
@@ -214,6 +223,23 @@ Creates, updates, deletes or gets a <code>cloud_exadata_infrastructure</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cloud_exadata_infrastructure_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) for the Exadata infrastructure."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-odb-cloudexadatainfrastructure.html"><code>AWS::ODB::CloudExadataInfrastructure</code></a>.
 
@@ -223,31 +249,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cloud_exadata_infrastructures</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cloud_exadata_infrastructures</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cloud_exadata_infrastructures</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cloud_exadata_infrastructures_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cloud_exadata_infrastructures</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -256,6 +288,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cloud_exadata_infrastructure</code>.
 ```sql
 SELECT
@@ -294,6 +335,19 @@ db_server_ids
 FROM awscc.odb.cloud_exadata_infrastructures
 WHERE region = 'us-east-1' AND data__Identifier = '<CloudExadataInfrastructureArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cloud_exadata_infrastructures</code> in a region.
+```sql
+SELECT
+region,
+cloud_exadata_infrastructure_arn
+FROM awscc.odb.cloud_exadata_infrastructures_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -411,6 +465,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.odb.cloud_exadata_infrastructures
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CloudExadataInfrastructureArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/odb/cloud_exadata_infrastructures_list_only/index.md b/website/docs/services/odb/cloud_exadata_infrastructures_list_only/index.md
deleted file mode 100644
index 716926513..000000000
--- a/website/docs/services/odb/cloud_exadata_infrastructures_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: cloud_exadata_infrastructures_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cloud_exadata_infrastructures_list_only
-  - odb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cloud_exadata_infrastructures</code> in a region or regions, for all properties use <a href="/services/odb/cloud_exadata_infrastructures/"><code>cloud_exadata_infrastructures</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cloud_exadata_infrastructures_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::ODB::CloudExadataInfrastructure resource creates an Exadata Infrastructure</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.odb.cloud_exadata_infrastructures_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cloud_exadata_infrastructure_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) for the Exadata infrastructure."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cloud_exadata_infrastructures</code> in a region.
-```sql
-SELECT
-region,
-cloud_exadata_infrastructure_arn
-FROM awscc.odb.cloud_exadata_infrastructures_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cloud_exadata_infrastructures_list_only</code> resource, see <a href="/services/odb/cloud_exadata_infrastructures/#permissions"><code>cloud_exadata_infrastructures</code></a>
-
diff --git a/website/docs/services/odb/cloud_vm_clusters/index.md b/website/docs/services/odb/cloud_vm_clusters/index.md
index 4ff431921..e8c5e2760 100644
--- a/website/docs/services/odb/cloud_vm_clusters/index.md
+++ b/website/docs/services/odb/cloud_vm_clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cloud_vm_cluster</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cloud_exadata_infrastructure_id",
@@ -244,6 +253,23 @@ Creates, updates, deletes or gets a <code>cloud_vm_cluster</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cloud_vm_cluster_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the VM cluster."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-odb-cloudvmcluster.html"><code>AWS::ODB::CloudVmCluster</code></a>.
 
@@ -253,31 +279,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cloud_vm_clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cloud_vm_clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cloud_vm_clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cloud_vm_clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cloud_vm_clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -286,6 +318,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cloud_vm_cluster</code>.
 ```sql
 SELECT
@@ -328,6 +369,19 @@ vip_ids
 FROM awscc.odb.cloud_vm_clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<CloudVmClusterArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cloud_vm_clusters</code> in a region.
+```sql
+SELECT
+region,
+cloud_vm_cluster_arn
+FROM awscc.odb.cloud_vm_clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -509,6 +563,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.odb.cloud_vm_clusters
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CloudVmClusterArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/odb/cloud_vm_clusters_list_only/index.md b/website/docs/services/odb/cloud_vm_clusters_list_only/index.md
deleted file mode 100644
index 66c7f99de..000000000
--- a/website/docs/services/odb/cloud_vm_clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: cloud_vm_clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cloud_vm_clusters_list_only
-  - odb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cloud_vm_clusters</code> in a region or regions, for all properties use <a href="/services/odb/cloud_vm_clusters/"><code>cloud_vm_clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cloud_vm_clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::ODB::CloudVmCluster resource creates a Cloud VM Cluster</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.odb.cloud_vm_clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cloud_vm_cluster_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the VM cluster."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cloud_vm_clusters</code> in a region.
-```sql
-SELECT
-region,
-cloud_vm_cluster_arn
-FROM awscc.odb.cloud_vm_clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cloud_vm_clusters_list_only</code> resource, see <a href="/services/odb/cloud_vm_clusters/#permissions"><code>cloud_vm_clusters</code></a>
-
diff --git a/website/docs/services/odb/index.md b/website/docs/services/odb/index.md
index 7c3216395..c8e2a390e 100644
--- a/website/docs/services/odb/index.md
+++ b/website/docs/services/odb/index.md
@@ -20,7 +20,7 @@ The odb service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The odb service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/odb/cloud_autonomous_vm_clusters/">cloud_autonomous_vm_clusters</a><br />
-<a href="/services/odb/cloud_autonomous_vm_clusters_list_only/">cloud_autonomous_vm_clusters_list_only</a><br />
-<a href="/services/odb/cloud_exadata_infrastructures/">cloud_exadata_infrastructures</a><br />
-<a href="/services/odb/cloud_exadata_infrastructures_list_only/">cloud_exadata_infrastructures_list_only</a>
+<a href="/services/odb/cloud_exadata_infrastructures/">cloud_exadata_infrastructures</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/odb/cloud_vm_clusters/">cloud_vm_clusters</a><br />
-<a href="/services/odb/cloud_vm_clusters_list_only/">cloud_vm_clusters_list_only</a><br />
-<a href="/services/odb/odb_networks/">odb_networks</a><br />
-<a href="/services/odb/odb_networks_list_only/">odb_networks_list_only</a>
+<a href="/services/odb/odb_networks/">odb_networks</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/odb/odb_networks/index.md b/website/docs/services/odb/odb_networks/index.md
index 96a1127de..beca0c4a2 100644
--- a/website/docs/services/odb/odb_networks/index.md
+++ b/website/docs/services/odb/odb_networks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>odb_network</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "availability_zone",
@@ -117,6 +126,23 @@ Creates, updates, deletes or gets an <code>odb_network</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "odb_network_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the ODB network."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-odb-odbnetwork.html"><code>AWS::ODB::OdbNetwork</code></a>.
 
@@ -126,31 +152,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>odb_networks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>odb_networks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>odb_networks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>odb_networks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>odb_networks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -159,6 +191,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>odb_network</code>.
 ```sql
 SELECT
@@ -179,6 +220,19 @@ tags
 FROM awscc.odb.odb_networks
 WHERE region = 'us-east-1' AND data__Identifier = '<OdbNetworkArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>odb_networks</code> in a region.
+```sql
+SELECT
+region,
+odb_network_arn
+FROM awscc.odb.odb_networks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -283,6 +337,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.odb.odb_networks
+SET data__PatchDocument = string('{{ {
+    "DeleteAssociatedResources": delete_associated_resources,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<OdbNetworkArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/odb/odb_networks_list_only/index.md b/website/docs/services/odb/odb_networks_list_only/index.md
deleted file mode 100644
index d6b7395a8..000000000
--- a/website/docs/services/odb/odb_networks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: odb_networks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - odb_networks_list_only
-  - odb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>odb_networks</code> in a region or regions, for all properties use <a href="/services/odb/odb_networks/"><code>odb_networks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>odb_networks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::ODB::OdbNetwork resource creates an ODB Network</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.odb.odb_networks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "odb_network_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the ODB network."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>odb_networks</code> in a region.
-```sql
-SELECT
-region,
-odb_network_arn
-FROM awscc.odb.odb_networks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>odb_networks_list_only</code> resource, see <a href="/services/odb/odb_networks/#permissions"><code>odb_networks</code></a>
-
diff --git a/website/docs/services/omics/annotation_stores/index.md b/website/docs/services/omics/annotation_stores/index.md
index 4928563c2..aca4a26c1 100644
--- a/website/docs/services/omics/annotation_stores/index.md
+++ b/website/docs/services/omics/annotation_stores/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>annotation_store</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "creation_time",
@@ -129,6 +138,23 @@ Creates, updates, deletes or gets an <code>annotation_store</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-omics-annotationstore.html"><code>AWS::Omics::AnnotationStore</code></a>.
 
@@ -138,31 +164,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>annotation_stores</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, StoreFormat, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>annotation_stores</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>annotation_stores</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>annotation_stores_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>annotation_stores</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -171,6 +203,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>annotation_store</code>.
 ```sql
 SELECT
@@ -192,6 +233,19 @@ update_time
 FROM awscc.omics.annotation_stores
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>annotation_stores</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.omics.annotation_stores_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -281,6 +335,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.omics.annotation_stores
+SET data__PatchDocument = string('{{ {
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/omics/annotation_stores_list_only/index.md b/website/docs/services/omics/annotation_stores_list_only/index.md
deleted file mode 100644
index 4d63b33dc..000000000
--- a/website/docs/services/omics/annotation_stores_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: annotation_stores_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - annotation_stores_list_only
-  - omics
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>annotation_stores</code> in a region or regions, for all properties use <a href="/services/omics/annotation_stores/"><code>annotation_stores</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>annotation_stores_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Omics::AnnotationStore Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.omics.annotation_stores_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>annotation_stores</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.omics.annotation_stores_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>annotation_stores_list_only</code> resource, see <a href="/services/omics/annotation_stores/#permissions"><code>annotation_stores</code></a>
-
diff --git a/website/docs/services/omics/index.md b/website/docs/services/omics/index.md
index 6573e453c..974e41f13 100644
--- a/website/docs/services/omics/index.md
+++ b/website/docs/services/omics/index.md
@@ -20,7 +20,7 @@ The omics service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>14</b></span><br />
+<span>total resources:&nbsp;<b>7</b></span><br />
 </div>
 </div>
 
@@ -30,20 +30,13 @@ The omics service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/omics/annotation_stores/">annotation_stores</a><br />
-<a href="/services/omics/annotation_stores_list_only/">annotation_stores_list_only</a><br />
 <a href="/services/omics/reference_stores/">reference_stores</a><br />
-<a href="/services/omics/reference_stores_list_only/">reference_stores_list_only</a><br />
 <a href="/services/omics/run_groups/">run_groups</a><br />
-<a href="/services/omics/run_groups_list_only/">run_groups_list_only</a><br />
 <a href="/services/omics/sequence_stores/">sequence_stores</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/omics/sequence_stores_list_only/">sequence_stores_list_only</a><br />
 <a href="/services/omics/variant_stores/">variant_stores</a><br />
-<a href="/services/omics/variant_stores_list_only/">variant_stores_list_only</a><br />
 <a href="/services/omics/workflow_versions/">workflow_versions</a><br />
-<a href="/services/omics/workflow_versions_list_only/">workflow_versions_list_only</a><br />
-<a href="/services/omics/workflows/">workflows</a><br />
-<a href="/services/omics/workflows_list_only/">workflows_list_only</a>
+<a href="/services/omics/workflows/">workflows</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/omics/reference_stores/index.md b/website/docs/services/omics/reference_stores/index.md
index 4b0d21c87..bbec9d8ad 100644
--- a/website/docs/services/omics/reference_stores/index.md
+++ b/website/docs/services/omics/reference_stores/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>reference_store</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>reference_store</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "reference_store_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-omics-referencestore.html"><code>AWS::Omics::ReferenceStore</code></a>.
 
@@ -96,26 +122,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>reference_stores</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>reference_stores</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>reference_stores_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>reference_stores</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +155,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>reference_store</code>.
 ```sql
 SELECT
@@ -138,6 +178,19 @@ tags
 FROM awscc.omics.reference_stores
 WHERE region = 'us-east-1' AND data__Identifier = '<ReferenceStoreId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>reference_stores</code> in a region.
+```sql
+SELECT
+region,
+reference_store_id
+FROM awscc.omics.reference_stores_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -212,6 +265,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/omics/reference_stores_list_only/index.md b/website/docs/services/omics/reference_stores_list_only/index.md
deleted file mode 100644
index e1d97fbad..000000000
--- a/website/docs/services/omics/reference_stores_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: reference_stores_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - reference_stores_list_only
-  - omics
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>reference_stores</code> in a region or regions, for all properties use <a href="/services/omics/reference_stores/"><code>reference_stores</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>reference_stores_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Omics::ReferenceStore Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.omics.reference_stores_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "reference_store_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>reference_stores</code> in a region.
-```sql
-SELECT
-region,
-reference_store_id
-FROM awscc.omics.reference_stores_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>reference_stores_list_only</code> resource, see <a href="/services/omics/reference_stores/#permissions"><code>reference_stores</code></a>
-
diff --git a/website/docs/services/omics/run_groups/index.md b/website/docs/services/omics/run_groups/index.md
index ae159066f..0fe632d50 100644
--- a/website/docs/services/omics/run_groups/index.md
+++ b/website/docs/services/omics/run_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>run_group</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -85,6 +94,23 @@ Creates, updates, deletes or gets a <code>run_group</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-omics-rungroup.html"><code>AWS::Omics::RunGroup</code></a>.
 
@@ -94,31 +120,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>run_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>run_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>run_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>run_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>run_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -127,6 +159,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>run_group</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.omics.run_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>run_groups</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.omics.run_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -233,6 +287,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.omics.run_groups
+SET data__PatchDocument = string('{{ {
+    "MaxCpus": max_cpus,
+    "MaxGpus": max_gpus,
+    "MaxDuration": max_duration,
+    "MaxRuns": max_runs,
+    "Name": name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/omics/run_groups_list_only/index.md b/website/docs/services/omics/run_groups_list_only/index.md
deleted file mode 100644
index 0744c6c13..000000000
--- a/website/docs/services/omics/run_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: run_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - run_groups_list_only
-  - omics
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>run_groups</code> in a region or regions, for all properties use <a href="/services/omics/run_groups/"><code>run_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>run_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Omics::RunGroup Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.omics.run_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>run_groups</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.omics.run_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>run_groups_list_only</code> resource, see <a href="/services/omics/run_groups/#permissions"><code>run_groups</code></a>
-
diff --git a/website/docs/services/omics/sequence_stores/index.md b/website/docs/services/omics/sequence_stores/index.md
index b415ae5f1..d99cd7e7e 100644
--- a/website/docs/services/omics/sequence_stores/index.md
+++ b/website/docs/services/omics/sequence_stores/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>sequence_store</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "access_log_location",
@@ -137,6 +146,23 @@ Creates, updates, deletes or gets a <code>sequence_store</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "sequence_store_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-omics-sequencestore.html"><code>AWS::Omics::SequenceStore</code></a>.
 
@@ -146,31 +172,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>sequence_stores</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>sequence_stores</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>sequence_stores</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>sequence_stores_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>sequence_stores</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -179,6 +211,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>sequence_store</code>.
 ```sql
 SELECT
@@ -203,6 +244,19 @@ update_time
 FROM awscc.omics.sequence_stores
 WHERE region = 'us-east-1' AND data__Identifier = '<SequenceStoreId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>sequence_stores</code> in a region.
+```sql
+SELECT
+region,
+sequence_store_id
+FROM awscc.omics.sequence_stores_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -298,6 +352,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.omics.sequence_stores
+SET data__PatchDocument = string('{{ {
+    "AccessLogLocation": access_log_location,
+    "Description": description,
+    "FallbackLocation": fallback_location,
+    "Name": name,
+    "PropagatedSetLevelTags": propagated_set_level_tags,
+    "S3AccessPolicy": s3_access_policy,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SequenceStoreId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/omics/sequence_stores_list_only/index.md b/website/docs/services/omics/sequence_stores_list_only/index.md
deleted file mode 100644
index a758b0981..000000000
--- a/website/docs/services/omics/sequence_stores_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: sequence_stores_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - sequence_stores_list_only
-  - omics
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>sequence_stores</code> in a region or regions, for all properties use <a href="/services/omics/sequence_stores/"><code>sequence_stores</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>sequence_stores_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Omics::SequenceStore</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.omics.sequence_stores_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "sequence_store_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>sequence_stores</code> in a region.
-```sql
-SELECT
-region,
-sequence_store_id
-FROM awscc.omics.sequence_stores_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>sequence_stores_list_only</code> resource, see <a href="/services/omics/sequence_stores/#permissions"><code>sequence_stores</code></a>
-
diff --git a/website/docs/services/omics/variant_stores/index.md b/website/docs/services/omics/variant_stores/index.md
index c10d270f1..0a21aa64f 100644
--- a/website/docs/services/omics/variant_stores/index.md
+++ b/website/docs/services/omics/variant_stores/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>variant_store</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "creation_time",
@@ -119,6 +128,23 @@ Creates, updates, deletes or gets a <code>variant_store</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-omics-variantstore.html"><code>AWS::Omics::VariantStore</code></a>.
 
@@ -128,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>variant_stores</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Reference, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>variant_stores</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>variant_stores</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>variant_stores_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>variant_stores</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>variant_store</code>.
 ```sql
 SELECT
@@ -180,6 +221,19 @@ update_time
 FROM awscc.omics.variant_stores
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>variant_stores</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.omics.variant_stores_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -261,6 +315,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.omics.variant_stores
+SET data__PatchDocument = string('{{ {
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/omics/variant_stores_list_only/index.md b/website/docs/services/omics/variant_stores_list_only/index.md
deleted file mode 100644
index 539c2656c..000000000
--- a/website/docs/services/omics/variant_stores_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: variant_stores_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - variant_stores_list_only
-  - omics
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>variant_stores</code> in a region or regions, for all properties use <a href="/services/omics/variant_stores/"><code>variant_stores</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>variant_stores_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Omics::VariantStore Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.omics.variant_stores_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>variant_stores</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.omics.variant_stores_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>variant_stores_list_only</code> resource, see <a href="/services/omics/variant_stores/#permissions"><code>variant_stores</code></a>
-
diff --git a/website/docs/services/omics/workflow_versions/index.md b/website/docs/services/omics/workflow_versions/index.md
index 152a26028..b8d8296ec 100644
--- a/website/docs/services/omics/workflow_versions/index.md
+++ b/website/docs/services/omics/workflow_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>workflow_version</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -184,6 +193,23 @@ Creates, updates, deletes or gets a <code>workflow_version</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-omics-workflowversion.html"><code>AWS::Omics::WorkflowVersion</code></a>.
 
@@ -193,31 +219,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>workflow_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="WorkflowId, VersionName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>workflow_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>workflow_versions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>workflow_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>workflow_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -226,6 +258,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>workflow_version</code>.
 ```sql
 SELECT
@@ -255,6 +296,19 @@ readme_markdown
 FROM awscc.omics.workflow_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>workflow_versions</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.omics.workflow_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -388,6 +442,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.omics.workflow_versions
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "StorageType": storage_type,
+    "StorageCapacity": storage_capacity,
+    "Tags": tags,
+    "readmeMarkdown": readme_markdown
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/omics/workflow_versions_list_only/index.md b/website/docs/services/omics/workflow_versions_list_only/index.md
deleted file mode 100644
index aa66fb26c..000000000
--- a/website/docs/services/omics/workflow_versions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: workflow_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - workflow_versions_list_only
-  - omics
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>workflow_versions</code> in a region or regions, for all properties use <a href="/services/omics/workflow_versions/"><code>workflow_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>workflow_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Omics::WorkflowVersion Resource Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.omics.workflow_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>workflow_versions</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.omics.workflow_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>workflow_versions_list_only</code> resource, see <a href="/services/omics/workflow_versions/#permissions"><code>workflow_versions</code></a>
-
diff --git a/website/docs/services/omics/workflows/index.md b/website/docs/services/omics/workflows/index.md
index da1aba189..e1a2b49c6 100644
--- a/website/docs/services/omics/workflows/index.md
+++ b/website/docs/services/omics/workflows/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>workflow</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -184,6 +193,23 @@ Creates, updates, deletes or gets a <code>workflow</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-omics-workflow.html"><code>AWS::Omics::Workflow</code></a>.
 
@@ -193,31 +219,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>workflows</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>workflows</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>workflows</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>workflows_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>workflows</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -226,6 +258,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>workflow</code>.
 ```sql
 SELECT
@@ -255,6 +296,19 @@ readme_markdown
 FROM awscc.omics.workflows
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>workflows</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.omics.workflows_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -412,6 +466,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.omics.workflows
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Name": name,
+    "Tags": tags,
+    "StorageType": storage_type,
+    "readmeMarkdown": readme_markdown
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/omics/workflows_list_only/index.md b/website/docs/services/omics/workflows_list_only/index.md
deleted file mode 100644
index d4d3412e5..000000000
--- a/website/docs/services/omics/workflows_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: workflows_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - workflows_list_only
-  - omics
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>workflows</code> in a region or regions, for all properties use <a href="/services/omics/workflows/"><code>workflows</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>workflows_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Omics::Workflow Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.omics.workflows_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>workflows</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.omics.workflows_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>workflows_list_only</code> resource, see <a href="/services/omics/workflows/#permissions"><code>workflows</code></a>
-
diff --git a/website/docs/services/opensearchserverless/access_policies/index.md b/website/docs/services/opensearchserverless/access_policies/index.md
index c10b8e17f..433d0a108 100644
--- a/website/docs/services/opensearchserverless/access_policies/index.md
+++ b/website/docs/services/opensearchserverless/access_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>access_policy</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets an <code>access_policy</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the policy"
+  },
+  {
+    "name": "type",
+    "type": "string",
+    "description": "The possible types for the access policy"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchserverless-accesspolicy.html"><code>AWS::OpenSearchServerless::AccessPolicy</code></a>.
 
@@ -69,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>access_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, Name, Policy, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>access_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>access_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>access_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>access_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>access_policy</code>.
 ```sql
 SELECT
@@ -113,6 +159,20 @@ policy
 FROM awscc.opensearchserverless.access_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Type>|<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>access_policies</code> in a region.
+```sql
+SELECT
+region,
+type,
+name
+FROM awscc.opensearchserverless.access_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -189,6 +249,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.opensearchserverless.access_policies
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Policy": policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Type>|<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/opensearchserverless/access_policies_list_only/index.md b/website/docs/services/opensearchserverless/access_policies_list_only/index.md
deleted file mode 100644
index a09ab0e8d..000000000
--- a/website/docs/services/opensearchserverless/access_policies_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: access_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - access_policies_list_only
-  - opensearchserverless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>access_policies</code> in a region or regions, for all properties use <a href="/services/opensearchserverless/access_policies/"><code>access_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>access_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Amazon OpenSearchServerless access policy resource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.opensearchserverless.access_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the policy"
-  },
-  {
-    "name": "type",
-    "type": "string",
-    "description": "The possible types for the access policy"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>access_policies</code> in a region.
-```sql
-SELECT
-region,
-type,
-name
-FROM awscc.opensearchserverless.access_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>access_policies_list_only</code> resource, see <a href="/services/opensearchserverless/access_policies/#permissions"><code>access_policies</code></a>
-
diff --git a/website/docs/services/opensearchserverless/collections/index.md b/website/docs/services/opensearchserverless/collections/index.md
index 19bf44f68..f66c6b93e 100644
--- a/website/docs/services/opensearchserverless/collections/index.md
+++ b/website/docs/services/opensearchserverless/collections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>collection</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>collection</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The identifier of the collection"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchserverless-collection.html"><code>AWS::OpenSearchServerless::Collection</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>collections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>collections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>collections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>collections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>collections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>collection</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ standby_replicas
 FROM awscc.opensearchserverless.collections
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>collections</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.opensearchserverless.collections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -233,6 +287,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.opensearchserverless.collections
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "StandbyReplicas": standby_replicas
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/opensearchserverless/collections_list_only/index.md b/website/docs/services/opensearchserverless/collections_list_only/index.md
deleted file mode 100644
index bff3213d9..000000000
--- a/website/docs/services/opensearchserverless/collections_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: collections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - collections_list_only
-  - opensearchserverless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>collections</code> in a region or regions, for all properties use <a href="/services/opensearchserverless/collections/"><code>collections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>collections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Amazon OpenSearchServerless collection resource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.opensearchserverless.collections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The identifier of the collection"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>collections</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.opensearchserverless.collections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>collections_list_only</code> resource, see <a href="/services/opensearchserverless/collections/#permissions"><code>collections</code></a>
-
diff --git a/website/docs/services/opensearchserverless/index.md b/website/docs/services/opensearchserverless/index.md
index c5fdd3373..d9fe944eb 100644
--- a/website/docs/services/opensearchserverless/index.md
+++ b/website/docs/services/opensearchserverless/index.md
@@ -20,7 +20,7 @@ The opensearchserverless service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>14</b></span><br />
+<span>total resources:&nbsp;<b>7</b></span><br />
 </div>
 </div>
 
@@ -30,20 +30,13 @@ The opensearchserverless service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/opensearchserverless/access_policies/">access_policies</a><br />
-<a href="/services/opensearchserverless/access_policies_list_only/">access_policies_list_only</a><br />
 <a href="/services/opensearchserverless/collections/">collections</a><br />
-<a href="/services/opensearchserverless/collections_list_only/">collections_list_only</a><br />
 <a href="/services/opensearchserverless/indices/">indices</a><br />
-<a href="/services/opensearchserverless/indices_list_only/">indices_list_only</a><br />
 <a href="/services/opensearchserverless/lifecycle_policies/">lifecycle_policies</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/opensearchserverless/lifecycle_policies_list_only/">lifecycle_policies_list_only</a><br />
 <a href="/services/opensearchserverless/security_configs/">security_configs</a><br />
-<a href="/services/opensearchserverless/security_configs_list_only/">security_configs_list_only</a><br />
 <a href="/services/opensearchserverless/security_policies/">security_policies</a><br />
-<a href="/services/opensearchserverless/security_policies_list_only/">security_policies_list_only</a><br />
-<a href="/services/opensearchserverless/vpc_endpoints/">vpc_endpoints</a><br />
-<a href="/services/opensearchserverless/vpc_endpoints_list_only/">vpc_endpoints_list_only</a>
+<a href="/services/opensearchserverless/vpc_endpoints/">vpc_endpoints</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/opensearchserverless/indices/index.md b/website/docs/services/opensearchserverless/indices/index.md
index f5a85ece0..abd6c82a8 100644
--- a/website/docs/services/opensearchserverless/indices/index.md
+++ b/website/docs/services/opensearchserverless/indices/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>index</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "collection_endpoint",
@@ -96,6 +105,28 @@ Creates, updates, deletes or gets an <code>index</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "collection_endpoint",
+    "type": "string",
+    "description": "The endpoint for the collection."
+  },
+  {
+    "name": "index_name",
+    "type": "string",
+    "description": "The name of the OpenSearch Serverless index."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchserverless-index.html"><code>AWS::OpenSearchServerless::Index</code></a>.
 
@@ -105,31 +136,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CollectionEndpoint, IndexName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>indices_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -138,6 +175,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>index</code>.
 ```sql
 SELECT
@@ -150,6 +196,20 @@ uuid
 FROM awscc.opensearchserverless.indices
 WHERE region = 'us-east-1' AND data__Identifier = '<IndexName>|<CollectionEndpoint>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>indices</code> in a region.
+```sql
+SELECT
+region,
+index_name,
+collection_endpoint
+FROM awscc.opensearchserverless.indices_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -229,6 +289,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.opensearchserverless.indices
+SET data__PatchDocument = string('{{ {
+    "Settings": settings,
+    "Mappings": mappings
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IndexName>|<CollectionEndpoint>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/opensearchserverless/indices_list_only/index.md b/website/docs/services/opensearchserverless/indices_list_only/index.md
deleted file mode 100644
index 1135d1b98..000000000
--- a/website/docs/services/opensearchserverless/indices_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: indices_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - indices_list_only
-  - opensearchserverless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>indices</code> in a region or regions, for all properties use <a href="/services/opensearchserverless/indices/"><code>indices</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>indices_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An OpenSearch Serverless index resource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.opensearchserverless.indices_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "collection_endpoint",
-    "type": "string",
-    "description": "The endpoint for the collection."
-  },
-  {
-    "name": "index_name",
-    "type": "string",
-    "description": "The name of the OpenSearch Serverless index."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>indices</code> in a region.
-```sql
-SELECT
-region,
-index_name,
-collection_endpoint
-FROM awscc.opensearchserverless.indices_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>indices_list_only</code> resource, see <a href="/services/opensearchserverless/indices/#permissions"><code>indices</code></a>
-
diff --git a/website/docs/services/opensearchserverless/lifecycle_policies/index.md b/website/docs/services/opensearchserverless/lifecycle_policies/index.md
index 9f6071889..d3e299d1a 100644
--- a/website/docs/services/opensearchserverless/lifecycle_policies/index.md
+++ b/website/docs/services/opensearchserverless/lifecycle_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>lifecycle_policy</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets a <code>lifecycle_policy</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the policy"
+  },
+  {
+    "name": "type",
+    "type": "string",
+    "description": "The type of lifecycle policy"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchserverless-lifecyclepolicy.html"><code>AWS::OpenSearchServerless::LifecyclePolicy</code></a>.
 
@@ -69,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>lifecycle_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, Name, Policy, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>lifecycle_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>lifecycle_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>lifecycle_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>lifecycle_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>lifecycle_policy</code>.
 ```sql
 SELECT
@@ -113,6 +159,20 @@ policy
 FROM awscc.opensearchserverless.lifecycle_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Type>|<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>lifecycle_policies</code> in a region.
+```sql
+SELECT
+region,
+type,
+name
+FROM awscc.opensearchserverless.lifecycle_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -189,6 +249,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.opensearchserverless.lifecycle_policies
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Policy": policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Type>|<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/opensearchserverless/lifecycle_policies_list_only/index.md b/website/docs/services/opensearchserverless/lifecycle_policies_list_only/index.md
deleted file mode 100644
index bd502cfee..000000000
--- a/website/docs/services/opensearchserverless/lifecycle_policies_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: lifecycle_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - lifecycle_policies_list_only
-  - opensearchserverless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>lifecycle_policies</code> in a region or regions, for all properties use <a href="/services/opensearchserverless/lifecycle_policies/"><code>lifecycle_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>lifecycle_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Amazon OpenSearchServerless lifecycle policy resource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.opensearchserverless.lifecycle_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the policy"
-  },
-  {
-    "name": "type",
-    "type": "string",
-    "description": "The type of lifecycle policy"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>lifecycle_policies</code> in a region.
-```sql
-SELECT
-region,
-type,
-name
-FROM awscc.opensearchserverless.lifecycle_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>lifecycle_policies_list_only</code> resource, see <a href="/services/opensearchserverless/lifecycle_policies/#permissions"><code>lifecycle_policies</code></a>
-
diff --git a/website/docs/services/opensearchserverless/security_configs/index.md b/website/docs/services/opensearchserverless/security_configs/index.md
index a5aa7ea06..b2e274f7f 100644
--- a/website/docs/services/opensearchserverless/security_configs/index.md
+++ b/website/docs/services/opensearchserverless/security_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>security_config</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -129,6 +138,23 @@ Creates, updates, deletes or gets a <code>security_config</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The identifier of the security config"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchserverless-securityconfig.html"><code>AWS::OpenSearchServerless::SecurityConfig</code></a>.
 
@@ -138,31 +164,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>security_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>security_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>security_configs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>security_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>security_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -171,6 +203,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>security_config</code>.
 ```sql
 SELECT
@@ -184,6 +225,19 @@ type
 FROM awscc.opensearchserverless.security_configs
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>security_configs</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.opensearchserverless.security_configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -279,6 +333,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.opensearchserverless.security_configs
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "SamlOptions": saml_options
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/opensearchserverless/security_configs_list_only/index.md b/website/docs/services/opensearchserverless/security_configs_list_only/index.md
deleted file mode 100644
index 38748909b..000000000
--- a/website/docs/services/opensearchserverless/security_configs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: security_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - security_configs_list_only
-  - opensearchserverless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>security_configs</code> in a region or regions, for all properties use <a href="/services/opensearchserverless/security_configs/"><code>security_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>security_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Amazon OpenSearchServerless security config resource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.opensearchserverless.security_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The identifier of the security config"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>security_configs</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.opensearchserverless.security_configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>security_configs_list_only</code> resource, see <a href="/services/opensearchserverless/security_configs/#permissions"><code>security_configs</code></a>
-
diff --git a/website/docs/services/opensearchserverless/security_policies/index.md b/website/docs/services/opensearchserverless/security_policies/index.md
index 3bc6b5bfd..25d97fce6 100644
--- a/website/docs/services/opensearchserverless/security_policies/index.md
+++ b/website/docs/services/opensearchserverless/security_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>security_policy</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets a <code>security_policy</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the policy"
+  },
+  {
+    "name": "type",
+    "type": "string",
+    "description": "The possible types for the network policy"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchserverless-securitypolicy.html"><code>AWS::OpenSearchServerless::SecurityPolicy</code></a>.
 
@@ -69,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>security_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, Name, Policy, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>security_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>security_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>security_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>security_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>security_policy</code>.
 ```sql
 SELECT
@@ -113,6 +159,20 @@ type
 FROM awscc.opensearchserverless.security_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Type>|<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>security_policies</code> in a region.
+```sql
+SELECT
+region,
+type,
+name
+FROM awscc.opensearchserverless.security_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -189,6 +249,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.opensearchserverless.security_policies
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Policy": policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Type>|<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/opensearchserverless/security_policies_list_only/index.md b/website/docs/services/opensearchserverless/security_policies_list_only/index.md
deleted file mode 100644
index 781cb6e6f..000000000
--- a/website/docs/services/opensearchserverless/security_policies_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: security_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - security_policies_list_only
-  - opensearchserverless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>security_policies</code> in a region or regions, for all properties use <a href="/services/opensearchserverless/security_policies/"><code>security_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>security_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Amazon OpenSearchServerless security policy resource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.opensearchserverless.security_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the policy"
-  },
-  {
-    "name": "type",
-    "type": "string",
-    "description": "The possible types for the network policy"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>security_policies</code> in a region.
-```sql
-SELECT
-region,
-type,
-name
-FROM awscc.opensearchserverless.security_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>security_policies_list_only</code> resource, see <a href="/services/opensearchserverless/security_policies/#permissions"><code>security_policies</code></a>
-
diff --git a/website/docs/services/opensearchserverless/vpc_endpoints/index.md b/website/docs/services/opensearchserverless/vpc_endpoints/index.md
index f6e01851e..4ba64cd87 100644
--- a/website/docs/services/opensearchserverless/vpc_endpoints/index.md
+++ b/website/docs/services/opensearchserverless/vpc_endpoints/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_endpoint</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -65,6 +74,23 @@ Creates, updates, deletes or gets a <code>vpc_endpoint</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The identifier of the VPC Endpoint"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchserverless-vpcendpoint.html"><code>AWS::OpenSearchServerless::VpcEndpoint</code></a>.
 
@@ -74,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_endpoints</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, VpcId, SubnetIds, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_endpoints</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_endpoints</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_endpoints_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_endpoints</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_endpoint</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ vpc_id
 FROM awscc.opensearchserverless.vpc_endpoints
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_endpoints</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.opensearchserverless.vpc_endpoints_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -197,6 +251,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.opensearchserverless.vpc_endpoints
+SET data__PatchDocument = string('{{ {
+    "SecurityGroupIds": security_group_ids,
+    "SubnetIds": subnet_ids
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/opensearchserverless/vpc_endpoints_list_only/index.md b/website/docs/services/opensearchserverless/vpc_endpoints_list_only/index.md
deleted file mode 100644
index 6d2f9402f..000000000
--- a/website/docs/services/opensearchserverless/vpc_endpoints_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: vpc_endpoints_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_endpoints_list_only
-  - opensearchserverless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_endpoints</code> in a region or regions, for all properties use <a href="/services/opensearchserverless/vpc_endpoints/"><code>vpc_endpoints</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_endpoints_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Amazon OpenSearchServerless vpc endpoint resource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.opensearchserverless.vpc_endpoints_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The identifier of the VPC Endpoint"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_endpoints</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.opensearchserverless.vpc_endpoints_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_endpoints_list_only</code> resource, see <a href="/services/opensearchserverless/vpc_endpoints/#permissions"><code>vpc_endpoints</code></a>
-
diff --git a/website/docs/services/opensearchservice/applications/index.md b/website/docs/services/opensearchservice/applications/index.md
index d28adb21a..45dbeba84 100644
--- a/website/docs/services/opensearchservice/applications/index.md
+++ b/website/docs/services/opensearchservice/applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "iam_identity_center_options",
@@ -133,6 +142,23 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the application."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-application.html"><code>AWS::OpenSearchService::Application</code></a>.
 
@@ -142,31 +168,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -175,6 +207,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application</code>.
 ```sql
 SELECT
@@ -190,6 +231,19 @@ tags
 FROM awscc.opensearchservice.applications
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>applications</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.opensearchservice.applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -279,6 +333,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.opensearchservice.applications
+SET data__PatchDocument = string('{{ {
+    "IamIdentityCenterOptions": iam_identity_center_options,
+    "Endpoint": endpoint,
+    "AppConfigs": app_configs,
+    "DataSources": data_sources,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/opensearchservice/applications_list_only/index.md b/website/docs/services/opensearchservice/applications_list_only/index.md
deleted file mode 100644
index cfebf3580..000000000
--- a/website/docs/services/opensearchservice/applications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - applications_list_only
-  - opensearchservice
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>applications</code> in a region or regions, for all properties use <a href="/services/opensearchservice/applications/"><code>applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Amazon OpenSearchService application resource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.opensearchservice.applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the application."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>applications</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.opensearchservice.applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>applications_list_only</code> resource, see <a href="/services/opensearchservice/applications/#permissions"><code>applications</code></a>
-
diff --git a/website/docs/services/opensearchservice/domains/index.md b/website/docs/services/opensearchservice/domains/index.md
index ae27b6961..b3fbcc42f 100644
--- a/website/docs/services/opensearchservice/domains/index.md
+++ b/website/docs/services/opensearchservice/domains/index.md
@@ -998,6 +998,35 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.opensearchservice.domains
+SET data__PatchDocument = string('{{ {
+    "ClusterConfig": cluster_config,
+    "AccessPolicies": access_policies,
+    "IPAddressType": ip_address_type,
+    "EngineVersion": engine_version,
+    "AdvancedOptions": advanced_options,
+    "LogPublishingOptions": log_publishing_options,
+    "SnapshotOptions": snapshot_options,
+    "VPCOptions": vpc_options,
+    "NodeToNodeEncryptionOptions": node_to_node_encryption_options,
+    "DomainEndpointOptions": domain_endpoint_options,
+    "CognitoOptions": cognito_options,
+    "EBSOptions": ebs_options,
+    "EncryptionAtRestOptions": encryption_at_rest_options,
+    "Tags": tags,
+    "OffPeakWindowOptions": off_peak_window_options,
+    "SoftwareUpdateOptions": software_update_options,
+    "SkipShardMigrationWait": skip_shard_migration_wait
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/opensearchservice/index.md b/website/docs/services/opensearchservice/index.md
index 4c78cf674..ea84ec1c2 100644
--- a/website/docs/services/opensearchservice/index.md
+++ b/website/docs/services/opensearchservice/index.md
@@ -20,7 +20,7 @@ The opensearchservice service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>3</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,8 +29,7 @@ The opensearchservice service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/opensearchservice/applications/">applications</a><br />
-<a href="/services/opensearchservice/applications_list_only/">applications_list_only</a>
+<a href="/services/opensearchservice/applications/">applications</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/opensearchservice/domains/">domains</a>
diff --git a/website/docs/services/organizations/accounts/index.md b/website/docs/services/organizations/accounts/index.md
index 47800ac81..617a78959 100644
--- a/website/docs/services/organizations/accounts/index.md
+++ b/website/docs/services/organizations/accounts/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>account</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "account_name",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets an <code>account</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "account_id",
+    "type": "string",
+    "description": "If the account was created successfully, the unique identifier (ID) of the new account."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-organizations-account.html"><code>AWS::Organizations::Account</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>accounts</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AccountName, Email, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>accounts</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>accounts</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>accounts_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>accounts</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>account</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ status
 FROM awscc.organizations.accounts
 WHERE region = 'us-east-1' AND data__Identifier = '<AccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>accounts</code> in a region.
+```sql
+SELECT
+region,
+account_id
+FROM awscc.organizations.accounts_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -242,6 +296,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.organizations.accounts
+SET data__PatchDocument = string('{{ {
+    "AccountName": account_name,
+    "Email": email,
+    "RoleName": role_name,
+    "ParentIds": parent_ids,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/organizations/accounts_list_only/index.md b/website/docs/services/organizations/accounts_list_only/index.md
deleted file mode 100644
index 810672d05..000000000
--- a/website/docs/services/organizations/accounts_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: accounts_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - accounts_list_only
-  - organizations
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>accounts</code> in a region or regions, for all properties use <a href="/services/organizations/accounts/"><code>accounts</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>accounts_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>You can use AWS::Organizations::Account to manage accounts in organization.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.organizations.accounts_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "account_id",
-    "type": "string",
-    "description": "If the account was created successfully, the unique identifier (ID) of the new account."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>accounts</code> in a region.
-```sql
-SELECT
-region,
-account_id
-FROM awscc.organizations.accounts_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>accounts_list_only</code> resource, see <a href="/services/organizations/accounts/#permissions"><code>accounts</code></a>
-
diff --git a/website/docs/services/organizations/index.md b/website/docs/services/organizations/index.md
index ce0dde2b8..95510f457 100644
--- a/website/docs/services/organizations/index.md
+++ b/website/docs/services/organizations/index.md
@@ -20,7 +20,7 @@ The organizations service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>10</b></span><br />
+<span>total resources:&nbsp;<b>5</b></span><br />
 </div>
 </div>
 
@@ -30,16 +30,11 @@ The organizations service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/organizations/accounts/">accounts</a><br />
-<a href="/services/organizations/accounts_list_only/">accounts_list_only</a><br />
 <a href="/services/organizations/organizational_units/">organizational_units</a><br />
-<a href="/services/organizations/organizational_units_list_only/">organizational_units_list_only</a><br />
 <a href="/services/organizations/organizations/">organizations</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/organizations/organizations_list_only/">organizations_list_only</a><br />
 <a href="/services/organizations/policies/">policies</a><br />
-<a href="/services/organizations/policies_list_only/">policies_list_only</a><br />
-<a href="/services/organizations/resource_policies/">resource_policies</a><br />
-<a href="/services/organizations/resource_policies_list_only/">resource_policies_list_only</a>
+<a href="/services/organizations/resource_policies/">resource_policies</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/organizations/organizational_units/index.md b/website/docs/services/organizations/organizational_units/index.md
index c22bbd7ec..40ae1244e 100644
--- a/website/docs/services/organizations/organizational_units/index.md
+++ b/website/docs/services/organizations/organizational_units/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>organizational_unit</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets an <code>organizational_unit</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The unique identifier (ID) associated with this OU."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-organizations-organizationalunit.html"><code>AWS::Organizations::OrganizationalUnit</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>organizational_units</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, ParentId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>organizational_units</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>organizational_units</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>organizational_units_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>organizational_units</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>organizational_unit</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.organizations.organizational_units
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>organizational_units</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.organizations.organizational_units_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -203,6 +257,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.organizations.organizational_units
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/organizations/organizational_units_list_only/index.md b/website/docs/services/organizations/organizational_units_list_only/index.md
deleted file mode 100644
index 385406a97..000000000
--- a/website/docs/services/organizations/organizational_units_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: organizational_units_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - organizational_units_list_only
-  - organizations
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>organizational_units</code> in a region or regions, for all properties use <a href="/services/organizations/organizational_units/"><code>organizational_units</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>organizational_units_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>You can use organizational units (OUs) to group accounts together to administer as a single unit. This greatly simplifies the management of your accounts. For example, you can attach a policy-based control to an OU, and all accounts within the OU automatically inherit the policy. You can create multiple OUs within a single organization, and you can create OUs within other OUs. Each OU can contain multiple accounts, and you can move accounts from one OU to another. However, OU names must be unique within a parent OU or root.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.organizations.organizational_units_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The unique identifier (ID) associated with this OU."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>organizational_units</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.organizations.organizational_units_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>organizational_units_list_only</code> resource, see <a href="/services/organizations/organizational_units/#permissions"><code>organizational_units</code></a>
-
diff --git a/website/docs/services/organizations/organizations/index.md b/website/docs/services/organizations/organizations/index.md
index 97db7ae97..a29e55f60 100644
--- a/website/docs/services/organizations/organizations/index.md
+++ b/website/docs/services/organizations/organizations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>organization</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -75,6 +84,23 @@ Creates, updates, deletes or gets an <code>organization</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The unique identifier (ID) of an organization."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-organizations-organization.html"><code>AWS::Organizations::Organization</code></a>.
 
@@ -84,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>organizations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>organizations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>organizations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>organizations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>organizations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>organization</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ root_id
 FROM awscc.organizations.organizations
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>organizations</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.organizations.organizations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -191,6 +245,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.organizations.organizations
+SET data__PatchDocument = string('{{ {
+    "FeatureSet": feature_set
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/organizations/organizations_list_only/index.md b/website/docs/services/organizations/organizations_list_only/index.md
deleted file mode 100644
index 73eddf28b..000000000
--- a/website/docs/services/organizations/organizations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: organizations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - organizations_list_only
-  - organizations
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>organizations</code> in a region or regions, for all properties use <a href="/services/organizations/organizations/"><code>organizations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>organizations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Organizations::Organization</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.organizations.organizations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The unique identifier (ID) of an organization."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>organizations</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.organizations.organizations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>organizations_list_only</code> resource, see <a href="/services/organizations/organizations/#permissions"><code>organizations</code></a>
-
diff --git a/website/docs/services/organizations/policies/index.md b/website/docs/services/organizations/policies/index.md
index 00199d75f..4bb1ef1d4 100644
--- a/website/docs/services/organizations/policies/index.md
+++ b/website/docs/services/organizations/policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>policy</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>policy</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Id of the Policy"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-organizations-policy.html"><code>AWS::Organizations::Policy</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Type, Content, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>policy</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ aws_managed
 FROM awscc.organizations.policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>policies</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.organizations.policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -242,6 +296,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.organizations.policies
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Content": content,
+    "Description": description,
+    "TargetIds": target_ids,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/organizations/policies_list_only/index.md b/website/docs/services/organizations/policies_list_only/index.md
deleted file mode 100644
index d573a400b..000000000
--- a/website/docs/services/organizations/policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - policies_list_only
-  - organizations
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>policies</code> in a region or regions, for all properties use <a href="/services/organizations/policies/"><code>policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Policies in AWS Organizations enable you to manage different features of the AWS accounts in your organization. You can use policies when all features are enabled in your organization.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.organizations.policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Id of the Policy"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>policies</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.organizations.policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>policies_list_only</code> resource, see <a href="/services/organizations/policies/#permissions"><code>policies</code></a>
-
diff --git a/website/docs/services/organizations/resource_policies/index.md b/website/docs/services/organizations/resource_policies/index.md
index e394cac46..7205d864b 100644
--- a/website/docs/services/organizations/resource_policies/index.md
+++ b/website/docs/services/organizations/resource_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_policy</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>resource_policy</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The unique identifier (ID) associated with this resource policy."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-organizations-resourcepolicy.html"><code>AWS::Organizations::ResourcePolicy</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Content, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_policy</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ tags
 FROM awscc.organizations.resource_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_policies</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.organizations.resource_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -191,6 +245,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.organizations.resource_policies
+SET data__PatchDocument = string('{{ {
+    "Content": content,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/organizations/resource_policies_list_only/index.md b/website/docs/services/organizations/resource_policies_list_only/index.md
deleted file mode 100644
index d5a5ec616..000000000
--- a/website/docs/services/organizations/resource_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_policies_list_only
-  - organizations
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_policies</code> in a region or regions, for all properties use <a href="/services/organizations/resource_policies/"><code>resource_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>You can use AWS::Organizations::ResourcePolicy to delegate policy management for AWS Organizations to specified member accounts to perform policy actions that are by default available only to the management account.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.organizations.resource_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The unique identifier (ID) associated with this resource policy."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_policies</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.organizations.resource_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_policies_list_only</code> resource, see <a href="/services/organizations/resource_policies/#permissions"><code>resource_policies</code></a>
-
diff --git a/website/docs/services/osis/index.md b/website/docs/services/osis/index.md
index 73dfa46d1..202057448 100644
--- a/website/docs/services/osis/index.md
+++ b/website/docs/services/osis/index.md
@@ -20,7 +20,7 @@ The osis service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The osis service documentation.
 <a href="/services/osis/pipelines/">pipelines</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/osis/pipelines_list_only/">pipelines_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/osis/pipelines/index.md b/website/docs/services/osis/pipelines/index.md
index 57f13e0b5..3b9acbdfc 100644
--- a/website/docs/services/osis/pipelines/index.md
+++ b/website/docs/services/osis/pipelines/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>pipeline</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "buffer_options",
@@ -196,6 +205,23 @@ Creates, updates, deletes or gets a <code>pipeline</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "pipeline_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the pipeline."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-osis-pipeline.html"><code>AWS::OSIS::Pipeline</code></a>.
 
@@ -205,31 +231,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="MaxUnits, MinUnits, PipelineConfigurationBody, PipelineName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>pipelines_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -238,6 +270,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>pipeline</code>.
 ```sql
 SELECT
@@ -258,6 +299,19 @@ ingest_endpoint_urls
 FROM awscc.osis.pipelines
 WHERE region = 'us-east-1' AND data__Identifier = '<PipelineArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>pipelines</code> in a region.
+```sql
+SELECT
+region,
+pipeline_arn
+FROM awscc.osis.pipelines_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -371,6 +425,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.osis.pipelines
+SET data__PatchDocument = string('{{ {
+    "BufferOptions": buffer_options,
+    "EncryptionAtRestOptions": encryption_at_rest_options,
+    "LogPublishingOptions": log_publishing_options,
+    "MaxUnits": max_units,
+    "MinUnits": min_units,
+    "PipelineConfigurationBody": pipeline_configuration_body,
+    "Tags": tags,
+    "VpcOptions": vpc_options
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PipelineArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/osis/pipelines_list_only/index.md b/website/docs/services/osis/pipelines_list_only/index.md
deleted file mode 100644
index a3da7906e..000000000
--- a/website/docs/services/osis/pipelines_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: pipelines_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - pipelines_list_only
-  - osis
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>pipelines</code> in a region or regions, for all properties use <a href="/services/osis/pipelines/"><code>pipelines</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>pipelines_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An OpenSearch Ingestion Service Data Prepper pipeline running Data Prepper.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.osis.pipelines_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "pipeline_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the pipeline."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>pipelines</code> in a region.
-```sql
-SELECT
-region,
-pipeline_arn
-FROM awscc.osis.pipelines_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>pipelines_list_only</code> resource, see <a href="/services/osis/pipelines/#permissions"><code>pipelines</code></a>
-
diff --git a/website/docs/services/panorama/application_instances/index.md b/website/docs/services/panorama/application_instances/index.md
index 6d3f225e1..40acd74d9 100644
--- a/website/docs/services/panorama/application_instances/index.md
+++ b/website/docs/services/panorama/application_instances/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application_instance</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "default_runtime_context_device_name",
@@ -136,6 +145,18 @@ Creates, updates, deletes or gets an <code>application_instance</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html"><code>AWS::Panorama::ApplicationInstance</code></a>.
 
@@ -145,31 +166,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>application_instances</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ManifestPayload, DefaultRuntimeContextDevice, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>application_instances</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>application_instances</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>application_instances_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>application_instances</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -178,6 +205,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application_instance</code>.
 ```sql
 SELECT
@@ -201,6 +237,19 @@ tags
 FROM awscc.panorama.application_instances
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationInstanceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>application_instances</code> in a region.
+```sql
+SELECT
+region,
+application_instance_id
+FROM awscc.panorama.application_instances_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -295,6 +344,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.panorama.application_instances
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationInstanceId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/panorama/application_instances_list_only/index.md b/website/docs/services/panorama/application_instances_list_only/index.md
deleted file mode 100644
index 0c1312b18..000000000
--- a/website/docs/services/panorama/application_instances_list_only/index.md
+++ /dev/null
@@ -1,75 +0,0 @@
----
-title: application_instances_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - application_instances_list_only
-  - panorama
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>application_instances</code> in a region or regions, for all properties use <a href="/services/panorama/application_instances/"><code>application_instances</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>application_instances_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates an application instance and deploys it to a device.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.panorama.application_instances_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>application_instances</code> in a region.
-```sql
-SELECT
-region,
-application_instance_id
-FROM awscc.panorama.application_instances_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>application_instances_list_only</code> resource, see <a href="/services/panorama/application_instances/#permissions"><code>application_instances</code></a>
-
diff --git a/website/docs/services/panorama/index.md b/website/docs/services/panorama/index.md
index c3f715d53..a081a1122 100644
--- a/website/docs/services/panorama/index.md
+++ b/website/docs/services/panorama/index.md
@@ -20,7 +20,7 @@ The panorama service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>5</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,11 +30,9 @@ The panorama service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/panorama/application_instances/">application_instances</a><br />
-<a href="/services/panorama/application_instances_list_only/">application_instances_list_only</a><br />
 <a href="/services/panorama/package_versions/">package_versions</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/panorama/packages/">packages</a><br />
-<a href="/services/panorama/packages_list_only/">packages_list_only</a>
+<a href="/services/panorama/packages/">packages</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/panorama/package_versions/index.md b/website/docs/services/panorama/package_versions/index.md
index 45ca9cca4..039e43254 100644
--- a/website/docs/services/panorama/package_versions/index.md
+++ b/website/docs/services/panorama/package_versions/index.md
@@ -235,6 +235,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.panorama.package_versions
+SET data__PatchDocument = string('{{ {
+    "MarkLatest": mark_latest,
+    "UpdatedLatestPatchVersion": updated_latest_patch_version
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PackageId>|<PackageVersion>|<PatchVersion>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/panorama/packages/index.md b/website/docs/services/panorama/packages/index.md
index da2fe7f9e..25bc972a7 100644
--- a/website/docs/services/panorama/packages/index.md
+++ b/website/docs/services/panorama/packages/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>package</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "package_name",
@@ -109,6 +118,23 @@ Creates, updates, deletes or gets a <code>package</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "package_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-package.html"><code>AWS::Panorama::Package</code></a>.
 
@@ -118,31 +144,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>packages</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PackageName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>packages</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>packages</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>packages_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>packages</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +183,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>package</code>.
 ```sql
 SELECT
@@ -164,6 +205,19 @@ tags
 FROM awscc.panorama.packages
 WHERE region = 'us-east-1' AND data__Identifier = '<PackageId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>packages</code> in a region.
+```sql
+SELECT
+region,
+package_id
+FROM awscc.panorama.packages_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -239,6 +293,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.panorama.packages
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PackageId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/panorama/packages_list_only/index.md b/website/docs/services/panorama/packages_list_only/index.md
deleted file mode 100644
index f8dc2764c..000000000
--- a/website/docs/services/panorama/packages_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: packages_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - packages_list_only
-  - panorama
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>packages</code> in a region or regions, for all properties use <a href="/services/panorama/packages/"><code>packages</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>packages_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a package and storage location in an Amazon S3 access point.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.panorama.packages_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "package_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>packages</code> in a region.
-```sql
-SELECT
-region,
-package_id
-FROM awscc.panorama.packages_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>packages_list_only</code> resource, see <a href="/services/panorama/packages/#permissions"><code>packages</code></a>
-
diff --git a/website/docs/services/paymentcryptography/aliases/index.md b/website/docs/services/paymentcryptography/aliases/index.md
index 8946d837f..2564c4d5f 100644
--- a/website/docs/services/paymentcryptography/aliases/index.md
+++ b/website/docs/services/paymentcryptography/aliases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>alias</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "alias_name",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets an <code>alias</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "alias_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-paymentcryptography-alias.html"><code>AWS::PaymentCryptography::Alias</code></a>.
 
@@ -59,31 +85,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AliasName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>aliases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>aliases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +124,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>alias</code>.
 ```sql
 SELECT
@@ -101,6 +142,19 @@ key_arn
 FROM awscc.paymentcryptography.aliases
 WHERE region = 'us-east-1' AND data__Identifier = '<AliasName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>aliases</code> in a region.
+```sql
+SELECT
+region,
+alias_name
+FROM awscc.paymentcryptography.aliases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -165,6 +219,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.paymentcryptography.aliases
+SET data__PatchDocument = string('{{ {
+    "KeyArn": key_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AliasName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/paymentcryptography/aliases_list_only/index.md b/website/docs/services/paymentcryptography/aliases_list_only/index.md
deleted file mode 100644
index ed39055bc..000000000
--- a/website/docs/services/paymentcryptography/aliases_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: aliases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - aliases_list_only
-  - paymentcryptography
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>aliases</code> in a region or regions, for all properties use <a href="/services/paymentcryptography/aliases/"><code>aliases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>aliases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::PaymentCryptography::Alias Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.paymentcryptography.aliases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "alias_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>aliases</code> in a region.
-```sql
-SELECT
-region,
-alias_name
-FROM awscc.paymentcryptography.aliases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>aliases_list_only</code> resource, see <a href="/services/paymentcryptography/aliases/#permissions"><code>aliases</code></a>
-
diff --git a/website/docs/services/paymentcryptography/index.md b/website/docs/services/paymentcryptography/index.md
index dfd2707cb..11bd922d6 100644
--- a/website/docs/services/paymentcryptography/index.md
+++ b/website/docs/services/paymentcryptography/index.md
@@ -20,7 +20,7 @@ The paymentcryptography service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The paymentcryptography service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/paymentcryptography/aliases/">aliases</a><br />
-<a href="/services/paymentcryptography/aliases_list_only/">aliases_list_only</a>
+<a href="/services/paymentcryptography/aliases/">aliases</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/paymentcryptography/keys/">keys</a><br />
-<a href="/services/paymentcryptography/keys_list_only/">keys_list_only</a>
+<a href="/services/paymentcryptography/keys/">keys</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/paymentcryptography/keys/index.md b/website/docs/services/paymentcryptography/keys/index.md
index f6a18bce4..d41972988 100644
--- a/website/docs/services/paymentcryptography/keys/index.md
+++ b/website/docs/services/paymentcryptography/keys/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>key</code> resource or lists <code>key
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "derive_key_usage",
@@ -166,6 +175,23 @@ Creates, updates, deletes or gets a <code>key</code> resource or lists <code>key
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "key_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-paymentcryptography-key.html"><code>AWS::PaymentCryptography::Key</code></a>.
 
@@ -175,31 +201,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>keys</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Exportable, KeyAttributes, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>keys</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>keys</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>keys_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>keys</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -208,6 +240,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>key</code>.
 ```sql
 SELECT
@@ -224,6 +265,19 @@ tags
 FROM awscc.paymentcryptography.keys
 WHERE region = 'us-east-1' AND data__Identifier = '<KeyIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>keys</code> in a region.
+```sql
+SELECT
+region,
+key_identifier
+FROM awscc.paymentcryptography.keys_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -321,6 +375,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.paymentcryptography.keys
+SET data__PatchDocument = string('{{ {
+    "DeriveKeyUsage": derive_key_usage,
+    "Enabled": enabled,
+    "Exportable": exportable,
+    "KeyAttributes": key_attributes,
+    "KeyCheckValueAlgorithm": key_check_value_algorithm,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<KeyIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/paymentcryptography/keys_list_only/index.md b/website/docs/services/paymentcryptography/keys_list_only/index.md
deleted file mode 100644
index 463fdc888..000000000
--- a/website/docs/services/paymentcryptography/keys_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: keys_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - keys_list_only
-  - paymentcryptography
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>keys</code> in a region or regions, for all properties use <a href="/services/paymentcryptography/keys/"><code>keys</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>keys_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::PaymentCryptography::Key Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.paymentcryptography.keys_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "key_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>keys</code> in a region.
-```sql
-SELECT
-region,
-key_identifier
-FROM awscc.paymentcryptography.keys_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>keys_list_only</code> resource, see <a href="/services/paymentcryptography/keys/#permissions"><code>keys</code></a>
-
diff --git a/website/docs/services/pcaconnectorad/connectors/index.md b/website/docs/services/pcaconnectorad/connectors/index.md
index f0d3d12d7..9fb83059d 100644
--- a/website/docs/services/pcaconnectorad/connectors/index.md
+++ b/website/docs/services/pcaconnectorad/connectors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>connector</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "certificate_authority_arn",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>connector</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "connector_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcaconnectorad-connector.html"><code>AWS::PCAConnectorAD::Connector</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CertificateAuthorityArn, DirectoryId, VpcInformation, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>connectors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>connector</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ vpc_information
 FROM awscc.pcaconnectorad.connectors
 WHERE region = 'us-east-1' AND data__Identifier = '<ConnectorArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>connectors</code> in a region.
+```sql
+SELECT
+region,
+connector_arn
+FROM awscc.pcaconnectorad.connectors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -210,6 +264,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.pcaconnectorad.connectors
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConnectorArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/pcaconnectorad/connectors_list_only/index.md b/website/docs/services/pcaconnectorad/connectors_list_only/index.md
deleted file mode 100644
index bc273c034..000000000
--- a/website/docs/services/pcaconnectorad/connectors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: connectors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - connectors_list_only
-  - pcaconnectorad
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>connectors</code> in a region or regions, for all properties use <a href="/services/pcaconnectorad/connectors/"><code>connectors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>connectors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a Connector that connects AWS PrivateCA and your directory</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.pcaconnectorad.connectors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "connector_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>connectors</code> in a region.
-```sql
-SELECT
-region,
-connector_arn
-FROM awscc.pcaconnectorad.connectors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>connectors_list_only</code> resource, see <a href="/services/pcaconnectorad/connectors/#permissions"><code>connectors</code></a>
-
diff --git a/website/docs/services/pcaconnectorad/directory_registrations/index.md b/website/docs/services/pcaconnectorad/directory_registrations/index.md
index 9178dfdf8..45056329c 100644
--- a/website/docs/services/pcaconnectorad/directory_registrations/index.md
+++ b/website/docs/services/pcaconnectorad/directory_registrations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>directory_registration</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "directory_id",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets a <code>directory_registration</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "directory_registration_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcaconnectorad-directoryregistration.html"><code>AWS::PCAConnectorAD::DirectoryRegistration</code></a>.
 
@@ -64,31 +90,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>directory_registrations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DirectoryId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>directory_registrations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>directory_registrations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>directory_registrations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>directory_registrations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +129,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>directory_registration</code>.
 ```sql
 SELECT
@@ -107,6 +148,19 @@ tags
 FROM awscc.pcaconnectorad.directory_registrations
 WHERE region = 'us-east-1' AND data__Identifier = '<DirectoryRegistrationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>directory_registrations</code> in a region.
+```sql
+SELECT
+region,
+directory_registration_arn
+FROM awscc.pcaconnectorad.directory_registrations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -171,6 +225,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.pcaconnectorad.directory_registrations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DirectoryRegistrationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/pcaconnectorad/directory_registrations_list_only/index.md b/website/docs/services/pcaconnectorad/directory_registrations_list_only/index.md
deleted file mode 100644
index cf4c5e6a7..000000000
--- a/website/docs/services/pcaconnectorad/directory_registrations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: directory_registrations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - directory_registrations_list_only
-  - pcaconnectorad
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>directory_registrations</code> in a region or regions, for all properties use <a href="/services/pcaconnectorad/directory_registrations/"><code>directory_registrations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>directory_registrations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::PCAConnectorAD::DirectoryRegistration Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.pcaconnectorad.directory_registrations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "directory_registration_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>directory_registrations</code> in a region.
-```sql
-SELECT
-region,
-directory_registration_arn
-FROM awscc.pcaconnectorad.directory_registrations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>directory_registrations_list_only</code> resource, see <a href="/services/pcaconnectorad/directory_registrations/#permissions"><code>directory_registrations</code></a>
-
diff --git a/website/docs/services/pcaconnectorad/index.md b/website/docs/services/pcaconnectorad/index.md
index c9842a8b3..6e9035f44 100644
--- a/website/docs/services/pcaconnectorad/index.md
+++ b/website/docs/services/pcaconnectorad/index.md
@@ -20,7 +20,7 @@ The pcaconnectorad service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>10</b></span><br />
+<span>total resources:&nbsp;<b>5</b></span><br />
 </div>
 </div>
 
@@ -30,16 +30,11 @@ The pcaconnectorad service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/pcaconnectorad/connectors/">connectors</a><br />
-<a href="/services/pcaconnectorad/connectors_list_only/">connectors_list_only</a><br />
 <a href="/services/pcaconnectorad/directory_registrations/">directory_registrations</a><br />
-<a href="/services/pcaconnectorad/directory_registrations_list_only/">directory_registrations_list_only</a><br />
 <a href="/services/pcaconnectorad/service_principal_names/">service_principal_names</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/pcaconnectorad/service_principal_names_list_only/">service_principal_names_list_only</a><br />
 <a href="/services/pcaconnectorad/template_group_access_control_entries/">template_group_access_control_entries</a><br />
-<a href="/services/pcaconnectorad/template_group_access_control_entries_list_only/">template_group_access_control_entries_list_only</a><br />
-<a href="/services/pcaconnectorad/templates/">templates</a><br />
-<a href="/services/pcaconnectorad/templates_list_only/">templates_list_only</a>
+<a href="/services/pcaconnectorad/templates/">templates</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/pcaconnectorad/service_principal_names/index.md b/website/docs/services/pcaconnectorad/service_principal_names/index.md
index 244ffca81..95f9257ab 100644
--- a/website/docs/services/pcaconnectorad/service_principal_names/index.md
+++ b/website/docs/services/pcaconnectorad/service_principal_names/index.md
@@ -33,6 +33,35 @@ Creates, updates, deletes or gets a <code>service_principal_name</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "connector_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "directory_registration_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "connector_arn",
@@ -50,6 +79,8 @@ Creates, updates, deletes or gets a <code>service_principal_name</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcaconnectorad-serviceprincipalname.html"><code>AWS::PCAConnectorAD::ServicePrincipalName</code></a>.
 
@@ -59,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>service_principal_names</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>service_principal_names</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>service_principal_names_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>service_principal_names</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>service_principal_name</code>.
 ```sql
 SELECT
@@ -96,6 +141,20 @@ directory_registration_arn
 FROM awscc.pcaconnectorad.service_principal_names
 WHERE region = 'us-east-1' AND data__Identifier = '<ConnectorArn>|<DirectoryRegistrationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>service_principal_names</code> in a region.
+```sql
+SELECT
+region,
+connector_arn,
+directory_registration_arn
+FROM awscc.pcaconnectorad.service_principal_names_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -162,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/pcaconnectorad/service_principal_names_list_only/index.md b/website/docs/services/pcaconnectorad/service_principal_names_list_only/index.md
deleted file mode 100644
index 938268e53..000000000
--- a/website/docs/services/pcaconnectorad/service_principal_names_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: service_principal_names_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - service_principal_names_list_only
-  - pcaconnectorad
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>service_principal_names</code> in a region or regions, for all properties use <a href="/services/pcaconnectorad/service_principal_names/"><code>service_principal_names</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>service_principal_names_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::PCAConnectorAD::ServicePrincipalName Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.pcaconnectorad.service_principal_names_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "connector_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "directory_registration_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>service_principal_names</code> in a region.
-```sql
-SELECT
-region,
-connector_arn,
-directory_registration_arn
-FROM awscc.pcaconnectorad.service_principal_names_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>service_principal_names_list_only</code> resource, see <a href="/services/pcaconnectorad/service_principal_names/#permissions"><code>service_principal_names</code></a>
-
diff --git a/website/docs/services/pcaconnectorad/template_group_access_control_entries/index.md b/website/docs/services/pcaconnectorad/template_group_access_control_entries/index.md
index 828c19ade..fe250c7f3 100644
--- a/website/docs/services/pcaconnectorad/template_group_access_control_entries/index.md
+++ b/website/docs/services/pcaconnectorad/template_group_access_control_entries/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>template_group_access_control_entry</c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "access_rights",
@@ -67,6 +76,28 @@ Creates, updates, deletes or gets a <code>template_group_access_control_entry</c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "group_security_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "template_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcaconnectorad-templategroupaccesscontrolentry.html"><code>AWS::PCAConnectorAD::TemplateGroupAccessControlEntry</code></a>.
 
@@ -76,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>template_group_access_control_entries</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AccessRights, GroupDisplayName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>template_group_access_control_entries</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>template_group_access_control_entries</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>template_group_access_control_entries_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>template_group_access_control_entries</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -109,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>template_group_access_control_entry</code>.
 ```sql
 SELECT
@@ -120,6 +166,20 @@ template_arn
 FROM awscc.pcaconnectorad.template_group_access_control_entries
 WHERE region = 'us-east-1' AND data__Identifier = '<GroupSecurityIdentifier>|<TemplateArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>template_group_access_control_entries</code> in a region.
+```sql
+SELECT
+region,
+group_security_identifier,
+template_arn
+FROM awscc.pcaconnectorad.template_group_access_control_entries_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -196,6 +256,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.pcaconnectorad.template_group_access_control_entries
+SET data__PatchDocument = string('{{ {
+    "AccessRights": access_rights,
+    "GroupDisplayName": group_display_name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<GroupSecurityIdentifier>|<TemplateArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/pcaconnectorad/template_group_access_control_entries_list_only/index.md b/website/docs/services/pcaconnectorad/template_group_access_control_entries_list_only/index.md
deleted file mode 100644
index 2f925609a..000000000
--- a/website/docs/services/pcaconnectorad/template_group_access_control_entries_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: template_group_access_control_entries_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - template_group_access_control_entries_list_only
-  - pcaconnectorad
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>template_group_access_control_entries</code> in a region or regions, for all properties use <a href="/services/pcaconnectorad/template_group_access_control_entries/"><code>template_group_access_control_entries</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>template_group_access_control_entries_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::PCAConnectorAD::TemplateGroupAccessControlEntry Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.pcaconnectorad.template_group_access_control_entries_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "group_security_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "template_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>template_group_access_control_entries</code> in a region.
-```sql
-SELECT
-region,
-group_security_identifier,
-template_arn
-FROM awscc.pcaconnectorad.template_group_access_control_entries_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>template_group_access_control_entries_list_only</code> resource, see <a href="/services/pcaconnectorad/template_group_access_control_entries/#permissions"><code>template_group_access_control_entries</code></a>
-
diff --git a/website/docs/services/pcaconnectorad/templates/index.md b/website/docs/services/pcaconnectorad/templates/index.md
index 62788c6d1..db6b27bf5 100644
--- a/website/docs/services/pcaconnectorad/templates/index.md
+++ b/website/docs/services/pcaconnectorad/templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>template</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "connector_arn",
@@ -70,6 +79,23 @@ Creates, updates, deletes or gets a <code>template</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "template_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcaconnectorad-template.html"><code>AWS::PCAConnectorAD::Template</code></a>.
 
@@ -79,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConnectorArn, Definition, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>template</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ template_arn
 FROM awscc.pcaconnectorad.templates
 WHERE region = 'us-east-1' AND data__Identifier = '<TemplateArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>templates</code> in a region.
+```sql
+SELECT
+region,
+template_arn
+FROM awscc.pcaconnectorad.templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +259,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.pcaconnectorad.templates
+SET data__PatchDocument = string('{{ {
+    "Definition": definition,
+    "ReenrollAllCertificateHolders": reenroll_all_certificate_holders,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TemplateArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/pcaconnectorad/templates_list_only/index.md b/website/docs/services/pcaconnectorad/templates_list_only/index.md
deleted file mode 100644
index a6967de33..000000000
--- a/website/docs/services/pcaconnectorad/templates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - templates_list_only
-  - pcaconnectorad
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>templates</code> in a region or regions, for all properties use <a href="/services/pcaconnectorad/templates/"><code>templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a template that defines certificate configurations, both for issuance and client handling</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.pcaconnectorad.templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "template_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>templates</code> in a region.
-```sql
-SELECT
-region,
-template_arn
-FROM awscc.pcaconnectorad.templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>templates_list_only</code> resource, see <a href="/services/pcaconnectorad/templates/#permissions"><code>templates</code></a>
-
diff --git a/website/docs/services/pcaconnectorscep/challenges/index.md b/website/docs/services/pcaconnectorscep/challenges/index.md
index 10ee11cbd..7b1068c64 100644
--- a/website/docs/services/pcaconnectorscep/challenges/index.md
+++ b/website/docs/services/pcaconnectorscep/challenges/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>challenge</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "challenge_arn",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets a <code>challenge</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "challenge_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcaconnectorscep-challenge.html"><code>AWS::PCAConnectorSCEP::Challenge</code></a>.
 
@@ -64,31 +90,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>challenges</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConnectorArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>challenges</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>challenges</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>challenges_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>challenges</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +129,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>challenge</code>.
 ```sql
 SELECT
@@ -107,6 +148,19 @@ tags
 FROM awscc.pcaconnectorscep.challenges
 WHERE region = 'us-east-1' AND data__Identifier = '<ChallengeArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>challenges</code> in a region.
+```sql
+SELECT
+region,
+challenge_arn
+FROM awscc.pcaconnectorscep.challenges_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -171,6 +225,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.pcaconnectorscep.challenges
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ChallengeArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/pcaconnectorscep/challenges_list_only/index.md b/website/docs/services/pcaconnectorscep/challenges_list_only/index.md
deleted file mode 100644
index d239ed263..000000000
--- a/website/docs/services/pcaconnectorscep/challenges_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: challenges_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - challenges_list_only
-  - pcaconnectorscep
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>challenges</code> in a region or regions, for all properties use <a href="/services/pcaconnectorscep/challenges/"><code>challenges</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>challenges_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a SCEP Challenge that is used for certificate enrollment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.pcaconnectorscep.challenges_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "challenge_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>challenges</code> in a region.
-```sql
-SELECT
-region,
-challenge_arn
-FROM awscc.pcaconnectorscep.challenges_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>challenges_list_only</code> resource, see <a href="/services/pcaconnectorscep/challenges/#permissions"><code>challenges</code></a>
-
diff --git a/website/docs/services/pcaconnectorscep/connectors/index.md b/website/docs/services/pcaconnectorscep/connectors/index.md
index 54ee92450..0a9e17629 100644
--- a/website/docs/services/pcaconnectorscep/connectors/index.md
+++ b/website/docs/services/pcaconnectorscep/connectors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>connector</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "certificate_authority_arn",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>connector</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "connector_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcaconnectorscep-connector.html"><code>AWS::PCAConnectorSCEP::Connector</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CertificateAuthorityArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>connectors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>connector</code>.
 ```sql
 SELECT
@@ -148,6 +189,19 @@ tags
 FROM awscc.pcaconnectorscep.connectors
 WHERE region = 'us-east-1' AND data__Identifier = '<ConnectorArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>connectors</code> in a region.
+```sql
+SELECT
+region,
+connector_arn
+FROM awscc.pcaconnectorscep.connectors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -216,6 +270,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.pcaconnectorscep.connectors
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConnectorArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/pcaconnectorscep/connectors_list_only/index.md b/website/docs/services/pcaconnectorscep/connectors_list_only/index.md
deleted file mode 100644
index ef2b4b2e0..000000000
--- a/website/docs/services/pcaconnectorscep/connectors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: connectors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - connectors_list_only
-  - pcaconnectorscep
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>connectors</code> in a region or regions, for all properties use <a href="/services/pcaconnectorscep/connectors/"><code>connectors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>connectors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a Connector that allows certificate issuance through Simple Certificate Enrollment Protocol (SCEP)</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.pcaconnectorscep.connectors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "connector_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>connectors</code> in a region.
-```sql
-SELECT
-region,
-connector_arn
-FROM awscc.pcaconnectorscep.connectors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>connectors_list_only</code> resource, see <a href="/services/pcaconnectorscep/connectors/#permissions"><code>connectors</code></a>
-
diff --git a/website/docs/services/pcaconnectorscep/index.md b/website/docs/services/pcaconnectorscep/index.md
index ff88c8eff..32d21e091 100644
--- a/website/docs/services/pcaconnectorscep/index.md
+++ b/website/docs/services/pcaconnectorscep/index.md
@@ -20,7 +20,7 @@ The pcaconnectorscep service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The pcaconnectorscep service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/pcaconnectorscep/challenges/">challenges</a><br />
-<a href="/services/pcaconnectorscep/challenges_list_only/">challenges_list_only</a>
+<a href="/services/pcaconnectorscep/challenges/">challenges</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/pcaconnectorscep/connectors/">connectors</a><br />
-<a href="/services/pcaconnectorscep/connectors_list_only/">connectors_list_only</a>
+<a href="/services/pcaconnectorscep/connectors/">connectors</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/pcs/clusters/index.md b/website/docs/services/pcs/clusters/index.md
index a145fb8e0..48e74018e 100644
--- a/website/docs/services/pcs/clusters/index.md
+++ b/website/docs/services/pcs/clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -221,6 +230,23 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The unique Amazon Resource Name (ARN) of the cluster."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcs-cluster.html"><code>AWS::PCS::Cluster</code></a>.
 
@@ -230,31 +256,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Networking, Scheduler, Size, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -263,6 +295,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cluster</code>.
 ```sql
 SELECT
@@ -281,6 +322,19 @@ tags
 FROM awscc.pcs.clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>clusters</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.pcs.clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -382,6 +436,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.pcs.clusters
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/pcs/clusters_list_only/index.md b/website/docs/services/pcs/clusters_list_only/index.md
deleted file mode 100644
index 5c9612547..000000000
--- a/website/docs/services/pcs/clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - clusters_list_only
-  - pcs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>clusters</code> in a region or regions, for all properties use <a href="/services/pcs/clusters/"><code>clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::PCS::Cluster resource creates an AWS PCS cluster.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.pcs.clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The unique Amazon Resource Name (ARN) of the cluster."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>clusters</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.pcs.clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>clusters_list_only</code> resource, see <a href="/services/pcs/clusters/#permissions"><code>clusters</code></a>
-
diff --git a/website/docs/services/pcs/compute_node_groups/index.md b/website/docs/services/pcs/compute_node_groups/index.md
index 058f0fd7a..f3e851429 100644
--- a/website/docs/services/pcs/compute_node_groups/index.md
+++ b/website/docs/services/pcs/compute_node_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>compute_node_group</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "status",
@@ -189,6 +198,23 @@ Creates, updates, deletes or gets a <code>compute_node_group</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The unique Amazon Resource Name (ARN) of the compute node group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcs-computenodegroup.html"><code>AWS::PCS::ComputeNodeGroup</code></a>.
 
@@ -198,31 +224,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>compute_node_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ClusterId, CustomLaunchTemplate, IamInstanceProfileArn, InstanceConfigs, ScalingConfiguration, SubnetIds, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>compute_node_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>compute_node_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>compute_node_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>compute_node_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -231,6 +263,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>compute_node_group</code>.
 ```sql
 SELECT
@@ -254,6 +295,19 @@ iam_instance_profile_arn
 FROM awscc.pcs.compute_node_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>compute_node_groups</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.pcs.compute_node_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -378,6 +432,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.pcs.compute_node_groups
+SET data__PatchDocument = string('{{ {
+    "SpotOptions": spot_options,
+    "SlurmConfiguration": slurm_configuration,
+    "SubnetIds": subnet_ids,
+    "ScalingConfiguration": scaling_configuration,
+    "PurchaseOption": purchase_option,
+    "CustomLaunchTemplate": custom_launch_template,
+    "Tags": tags,
+    "AmiId": ami_id,
+    "IamInstanceProfileArn": iam_instance_profile_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/pcs/compute_node_groups_list_only/index.md b/website/docs/services/pcs/compute_node_groups_list_only/index.md
deleted file mode 100644
index 992fab21e..000000000
--- a/website/docs/services/pcs/compute_node_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: compute_node_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - compute_node_groups_list_only
-  - pcs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>compute_node_groups</code> in a region or regions, for all properties use <a href="/services/pcs/compute_node_groups/"><code>compute_node_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>compute_node_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::PCS::ComputeNodeGroup resource creates an AWS PCS compute node group.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.pcs.compute_node_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The unique Amazon Resource Name (ARN) of the compute node group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>compute_node_groups</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.pcs.compute_node_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>compute_node_groups_list_only</code> resource, see <a href="/services/pcs/compute_node_groups/#permissions"><code>compute_node_groups</code></a>
-
diff --git a/website/docs/services/pcs/index.md b/website/docs/services/pcs/index.md
index 7876e14c0..fcabad66a 100644
--- a/website/docs/services/pcs/index.md
+++ b/website/docs/services/pcs/index.md
@@ -20,7 +20,7 @@ The pcs service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The pcs service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/pcs/clusters/">clusters</a><br />
-<a href="/services/pcs/clusters_list_only/">clusters_list_only</a><br />
 <a href="/services/pcs/compute_node_groups/">compute_node_groups</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/pcs/compute_node_groups_list_only/">compute_node_groups_list_only</a><br />
-<a href="/services/pcs/queues/">queues</a><br />
-<a href="/services/pcs/queues_list_only/">queues_list_only</a>
+<a href="/services/pcs/queues/">queues</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/pcs/queues/index.md b/website/docs/services/pcs/queues/index.md
index 98414382b..3dc39a0ab 100644
--- a/website/docs/services/pcs/queues/index.md
+++ b/website/docs/services/pcs/queues/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>queue</code> resource or lists <code>q
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -99,6 +108,23 @@ Creates, updates, deletes or gets a <code>queue</code> resource or lists <code>q
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The unique Amazon Resource Name (ARN) of the queue."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcs-queue.html"><code>AWS::PCS::Queue</code></a>.
 
@@ -108,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ClusterId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>queues_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>queue</code>.
 ```sql
 SELECT
@@ -156,6 +197,19 @@ tags
 FROM awscc.pcs.queues
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>queues</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.pcs.queues_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -229,6 +283,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.pcs.queues
+SET data__PatchDocument = string('{{ {
+    "ComputeNodeGroupConfigurations": compute_node_group_configurations,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/pcs/queues_list_only/index.md b/website/docs/services/pcs/queues_list_only/index.md
deleted file mode 100644
index 1911272a2..000000000
--- a/website/docs/services/pcs/queues_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: queues_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - queues_list_only
-  - pcs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>queues</code> in a region or regions, for all properties use <a href="/services/pcs/queues/"><code>queues</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>queues_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::PCS::Queue resource creates an AWS PCS queue.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.pcs.queues_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The unique Amazon Resource Name (ARN) of the queue."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>queues</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.pcs.queues_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>queues_list_only</code> resource, see <a href="/services/pcs/queues/#permissions"><code>queues</code></a>
-
diff --git a/website/docs/services/personalize/dataset_groups/index.md b/website/docs/services/personalize/dataset_groups/index.md
index c178f9d06..28364cdf4 100644
--- a/website/docs/services/personalize/dataset_groups/index.md
+++ b/website/docs/services/personalize/dataset_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>dataset_group</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "dataset_group_arn",
@@ -65,6 +74,23 @@ Creates, updates, deletes or gets a <code>dataset_group</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "dataset_group_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the dataset group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-personalize-datasetgroup.html"><code>AWS::Personalize::DatasetGroup</code></a>.
 
@@ -74,26 +100,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>dataset_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>dataset_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>dataset_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>dataset_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +133,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dataset_group</code>.
 ```sql
 SELECT
@@ -114,6 +154,19 @@ domain
 FROM awscc.personalize.dataset_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<DatasetGroupArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>dataset_groups</code> in a region.
+```sql
+SELECT
+region,
+dataset_group_arn
+FROM awscc.personalize.dataset_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -186,6 +239,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/personalize/dataset_groups_list_only/index.md b/website/docs/services/personalize/dataset_groups_list_only/index.md
deleted file mode 100644
index 688e47107..000000000
--- a/website/docs/services/personalize/dataset_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: dataset_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - dataset_groups_list_only
-  - personalize
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>dataset_groups</code> in a region or regions, for all properties use <a href="/services/personalize/dataset_groups/"><code>dataset_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>dataset_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema for AWS::Personalize::DatasetGroup.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.personalize.dataset_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "dataset_group_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the dataset group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>dataset_groups</code> in a region.
-```sql
-SELECT
-region,
-dataset_group_arn
-FROM awscc.personalize.dataset_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>dataset_groups_list_only</code> resource, see <a href="/services/personalize/dataset_groups/#permissions"><code>dataset_groups</code></a>
-
diff --git a/website/docs/services/personalize/datasets/index.md b/website/docs/services/personalize/datasets/index.md
index c5e26b2c9..eb816d078 100644
--- a/website/docs/services/personalize/datasets/index.md
+++ b/website/docs/services/personalize/datasets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>dataset</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -104,6 +113,23 @@ Creates, updates, deletes or gets a <code>dataset</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "dataset_arn",
+    "type": "string",
+    "description": "The ARN of the dataset"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-personalize-dataset.html"><code>AWS::Personalize::Dataset</code></a>.
 
@@ -113,31 +139,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, DatasetType, DatasetGroupArn, SchemaArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>datasets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>datasets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -146,6 +178,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dataset</code>.
 ```sql
 SELECT
@@ -159,6 +200,19 @@ dataset_import_job
 FROM awscc.personalize.datasets
 WHERE region = 'us-east-1' AND data__Identifier = '<DatasetArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>datasets</code> in a region.
+```sql
+SELECT
+region,
+dataset_arn
+FROM awscc.personalize.datasets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -247,6 +301,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.personalize.datasets
+SET data__PatchDocument = string('{{ {
+    "DatasetImportJob": dataset_import_job
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DatasetArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/personalize/datasets_list_only/index.md b/website/docs/services/personalize/datasets_list_only/index.md
deleted file mode 100644
index db4ac2ece..000000000
--- a/website/docs/services/personalize/datasets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: datasets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - datasets_list_only
-  - personalize
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>datasets</code> in a region or regions, for all properties use <a href="/services/personalize/datasets/"><code>datasets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>datasets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Personalize::Dataset.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.personalize.datasets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "dataset_arn",
-    "type": "string",
-    "description": "The ARN of the dataset"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>datasets</code> in a region.
-```sql
-SELECT
-region,
-dataset_arn
-FROM awscc.personalize.datasets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>datasets_list_only</code> resource, see <a href="/services/personalize/datasets/#permissions"><code>datasets</code></a>
-
diff --git a/website/docs/services/personalize/index.md b/website/docs/services/personalize/index.md
index 41de6dda7..0c8699870 100644
--- a/website/docs/services/personalize/index.md
+++ b/website/docs/services/personalize/index.md
@@ -20,7 +20,7 @@ The personalize service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The personalize service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/personalize/dataset_groups/">dataset_groups</a><br />
-<a href="/services/personalize/dataset_groups_list_only/">dataset_groups_list_only</a><br />
-<a href="/services/personalize/datasets/">datasets</a><br />
-<a href="/services/personalize/datasets_list_only/">datasets_list_only</a>
+<a href="/services/personalize/datasets/">datasets</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/personalize/schemata/">schemata</a><br />
-<a href="/services/personalize/schemata_list_only/">schemata_list_only</a><br />
-<a href="/services/personalize/solutions/">solutions</a><br />
-<a href="/services/personalize/solutions_list_only/">solutions_list_only</a>
+<a href="/services/personalize/solutions/">solutions</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/personalize/schemata/index.md b/website/docs/services/personalize/schemata/index.md
index 8159a75df..2ef8db7de 100644
--- a/website/docs/services/personalize/schemata/index.md
+++ b/website/docs/services/personalize/schemata/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>schema</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets a <code>schema</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "schema_arn",
+    "type": "string",
+    "description": "Arn for the schema."
+  },
+  {
+    "name": "schema",
+    "type": "string",
+    "description": "A schema in Avro JSON format."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-personalize-schema.html"><code>AWS::Personalize::Schema</code></a>.
 
@@ -69,26 +100,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>schemata</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Schema, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>schemata</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>schemata_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>schemata</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +133,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>schema</code>.
 ```sql
 SELECT
@@ -108,6 +153,19 @@ domain
 FROM awscc.personalize.schemata
 WHERE region = 'us-east-1' AND data__Identifier = '<SchemaArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>schemata</code> in a region.
+```sql
+SELECT
+region,
+schema_arn
+FROM awscc.personalize.schemata_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -178,6 +236,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/personalize/schemata_list_only/index.md b/website/docs/services/personalize/schemata_list_only/index.md
deleted file mode 100644
index 0cfe559e7..000000000
--- a/website/docs/services/personalize/schemata_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: schemata_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - schemata_list_only
-  - personalize
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>schemata</code> in a region or regions, for all properties use <a href="/services/personalize/schemata/"><code>schemata</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>schemata_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Personalize::Schema.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.personalize.schemata_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "schema_arn",
-    "type": "string",
-    "description": "Arn for the schema."
-  },
-  {
-    "name": "schema",
-    "type": "string",
-    "description": "A schema in Avro JSON format."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>schemata</code> in a region.
-```sql
-SELECT
-region,
-schema_arn
-FROM awscc.personalize.schemata_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>schemata_list_only</code> resource, see <a href="/services/personalize/schemata/#permissions"><code>schemata</code></a>
-
diff --git a/website/docs/services/personalize/solutions/index.md b/website/docs/services/personalize/solutions/index.md
index d130e866a..0850f275e 100644
--- a/website/docs/services/personalize/solutions/index.md
+++ b/website/docs/services/personalize/solutions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>solution</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -182,6 +191,23 @@ Creates, updates, deletes or gets a <code>solution</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "solution_arn",
+    "type": "string",
+    "description": "The ARN of the solution"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-personalize-solution.html"><code>AWS::Personalize::Solution</code></a>.
 
@@ -191,26 +217,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>solutions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, DatasetGroupArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>solutions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>solutions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>solutions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -219,6 +250,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>solution</code>.
 ```sql
 SELECT
@@ -234,6 +274,19 @@ solution_config
 FROM awscc.personalize.solutions
 WHERE region = 'us-east-1' AND data__Identifier = '<SolutionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>solutions</code> in a region.
+```sql
+SELECT
+region,
+solution_arn
+FROM awscc.personalize.solutions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -348,6 +401,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/personalize/solutions_list_only/index.md b/website/docs/services/personalize/solutions_list_only/index.md
deleted file mode 100644
index b7d6640b0..000000000
--- a/website/docs/services/personalize/solutions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: solutions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - solutions_list_only
-  - personalize
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>solutions</code> in a region or regions, for all properties use <a href="/services/personalize/solutions/"><code>solutions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>solutions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Personalize::Solution.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.personalize.solutions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "solution_arn",
-    "type": "string",
-    "description": "The ARN of the solution"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>solutions</code> in a region.
-```sql
-SELECT
-region,
-solution_arn
-FROM awscc.personalize.solutions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>solutions_list_only</code> resource, see <a href="/services/personalize/solutions/#permissions"><code>solutions</code></a>
-
diff --git a/website/docs/services/pinpoint/in_app_templates/index.md b/website/docs/services/pinpoint/in_app_templates/index.md
index 09f54642e..3503e0140 100644
--- a/website/docs/services/pinpoint/in_app_templates/index.md
+++ b/website/docs/services/pinpoint/in_app_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>in_app_template</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -192,6 +201,23 @@ Creates, updates, deletes or gets an <code>in_app_template</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "template_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-inapptemplate.html"><code>AWS::Pinpoint::InAppTemplate</code></a>.
 
@@ -201,31 +227,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>in_app_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TemplateName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>in_app_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>in_app_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>in_app_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>in_app_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -234,6 +266,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>in_app_template</code>.
 ```sql
 SELECT
@@ -248,6 +289,19 @@ template_name
 FROM awscc.pinpoint.in_app_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<TemplateName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>in_app_templates</code> in a region.
+```sql
+SELECT
+region,
+template_name
+FROM awscc.pinpoint.in_app_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -352,6 +406,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.pinpoint.in_app_templates
+SET data__PatchDocument = string('{{ {
+    "Content": content,
+    "CustomConfig": custom_config,
+    "Layout": layout,
+    "Tags": tags,
+    "TemplateDescription": template_description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TemplateName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/pinpoint/in_app_templates_list_only/index.md b/website/docs/services/pinpoint/in_app_templates_list_only/index.md
deleted file mode 100644
index 8782024cf..000000000
--- a/website/docs/services/pinpoint/in_app_templates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: in_app_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - in_app_templates_list_only
-  - pinpoint
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>in_app_templates</code> in a region or regions, for all properties use <a href="/services/pinpoint/in_app_templates/"><code>in_app_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>in_app_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Pinpoint::InAppTemplate</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.pinpoint.in_app_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "template_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>in_app_templates</code> in a region.
-```sql
-SELECT
-region,
-template_name
-FROM awscc.pinpoint.in_app_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>in_app_templates_list_only</code> resource, see <a href="/services/pinpoint/in_app_templates/#permissions"><code>in_app_templates</code></a>
-
diff --git a/website/docs/services/pinpoint/index.md b/website/docs/services/pinpoint/index.md
index fc6de963f..5314e93d9 100644
--- a/website/docs/services/pinpoint/index.md
+++ b/website/docs/services/pinpoint/index.md
@@ -20,7 +20,7 @@ The pinpoint service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The pinpoint service documentation.
 <a href="/services/pinpoint/in_app_templates/">in_app_templates</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/pinpoint/in_app_templates_list_only/">in_app_templates_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/pipes/index.md b/website/docs/services/pipes/index.md
index ae0a43a29..475c58c3b 100644
--- a/website/docs/services/pipes/index.md
+++ b/website/docs/services/pipes/index.md
@@ -20,7 +20,7 @@ The pipes service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The pipes service documentation.
 <a href="/services/pipes/pipes/">pipes</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/pipes/pipes_list_only/">pipes_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/pipes/pipes/index.md b/website/docs/services/pipes/pipes/index.md
index 009f7eafe..67d1f7cca 100644
--- a/website/docs/services/pipes/pipes/index.md
+++ b/website/docs/services/pipes/pipes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>pipe</code> resource or lists <code>pi
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -1087,6 +1096,23 @@ Creates, updates, deletes or gets a <code>pipe</code> resource or lists <code>pi
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pipes-pipe.html"><code>AWS::Pipes::Pipe</code></a>.
 
@@ -1096,31 +1122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>pipes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RoleArn, Source, Target, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>pipes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>pipes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>pipes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>pipes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -1129,6 +1161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>pipe</code>.
 ```sql
 SELECT
@@ -1154,6 +1195,19 @@ target_parameters
 FROM awscc.pipes.pipes
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>pipes</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.pipes.pipes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1477,6 +1531,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.pipes.pipes
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "DesiredState": desired_state,
+    "Enrichment": enrichment,
+    "EnrichmentParameters": enrichment_parameters,
+    "KmsKeyIdentifier": kms_key_identifier,
+    "LogConfiguration": log_configuration,
+    "RoleArn": role_arn,
+    "Tags": tags,
+    "Target": target,
+    "TargetParameters": target_parameters
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/pipes/pipes_list_only/index.md b/website/docs/services/pipes/pipes_list_only/index.md
deleted file mode 100644
index 5a63c446a..000000000
--- a/website/docs/services/pipes/pipes_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: pipes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - pipes_list_only
-  - pipes
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>pipes</code> in a region or regions, for all properties use <a href="/services/pipes/pipes/"><code>pipes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>pipes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Pipes::Pipe Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.pipes.pipes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>pipes</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.pipes.pipes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>pipes_list_only</code> resource, see <a href="/services/pipes/pipes/#permissions"><code>pipes</code></a>
-
diff --git a/website/docs/services/proton/environment_account_connections/index.md b/website/docs/services/proton/environment_account_connections/index.md
index 9c3e2715f..bab9e769a 100644
--- a/website/docs/services/proton/environment_account_connections/index.md
+++ b/website/docs/services/proton/environment_account_connections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>environment_account_connection</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets an <code>environment_account_connection</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the environment account connection."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-proton-environmentaccountconnection.html"><code>AWS::Proton::EnvironmentAccountConnection</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>environment_account_connections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>environment_account_connections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>environment_account_connections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>environment_account_connections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>environment_account_connections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>environment_account_connection</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ tags
 FROM awscc.proton.environment_account_connections
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>environment_account_connections</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.proton.environment_account_connections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -259,6 +313,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.proton.environment_account_connections
+SET data__PatchDocument = string('{{ {
+    "CodebuildRoleArn": codebuild_role_arn,
+    "ComponentRoleArn": component_role_arn,
+    "EnvironmentAccountId": environment_account_id,
+    "EnvironmentName": environment_name,
+    "ManagementAccountId": management_account_id,
+    "RoleArn": role_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/proton/environment_account_connections_list_only/index.md b/website/docs/services/proton/environment_account_connections_list_only/index.md
deleted file mode 100644
index 37f9d6874..000000000
--- a/website/docs/services/proton/environment_account_connections_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: environment_account_connections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - environment_account_connections_list_only
-  - proton
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>environment_account_connections</code> in a region or regions, for all properties use <a href="/services/proton/environment_account_connections/"><code>environment_account_connections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>environment_account_connections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema describing various properties for AWS Proton Environment Account Connections resources.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.proton.environment_account_connections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the environment account connection."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>environment_account_connections</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.proton.environment_account_connections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>environment_account_connections_list_only</code> resource, see <a href="/services/proton/environment_account_connections/#permissions"><code>environment_account_connections</code></a>
-
diff --git a/website/docs/services/proton/environment_templates/index.md b/website/docs/services/proton/environment_templates/index.md
index 6267dba88..de8f347bc 100644
--- a/website/docs/services/proton/environment_templates/index.md
+++ b/website/docs/services/proton/environment_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>environment_template</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets an <code>environment_template</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "<p>The Amazon Resource Name (ARN) of the environment template.</p>"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-proton-environmenttemplate.html"><code>AWS::Proton::EnvironmentTemplate</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>environment_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>environment_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>environment_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>environment_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>environment_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>environment_template</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.proton.environment_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>environment_templates</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.proton.environment_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -235,6 +289,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.proton.environment_templates
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "DisplayName": display_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/proton/environment_templates_list_only/index.md b/website/docs/services/proton/environment_templates_list_only/index.md
deleted file mode 100644
index 324bf7195..000000000
--- a/website/docs/services/proton/environment_templates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: environment_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - environment_templates_list_only
-  - proton
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>environment_templates</code> in a region or regions, for all properties use <a href="/services/proton/environment_templates/"><code>environment_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>environment_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Proton::EnvironmentTemplate Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.proton.environment_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "<p>The Amazon Resource Name (ARN) of the environment template.</p>"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>environment_templates</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.proton.environment_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>environment_templates_list_only</code> resource, see <a href="/services/proton/environment_templates/#permissions"><code>environment_templates</code></a>
-
diff --git a/website/docs/services/proton/index.md b/website/docs/services/proton/index.md
index 20d634b64..a006bfdaf 100644
--- a/website/docs/services/proton/index.md
+++ b/website/docs/services/proton/index.md
@@ -20,7 +20,7 @@ The proton service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The proton service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/proton/environment_account_connections/">environment_account_connections</a><br />
-<a href="/services/proton/environment_account_connections_list_only/">environment_account_connections_list_only</a><br />
 <a href="/services/proton/environment_templates/">environment_templates</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/proton/environment_templates_list_only/">environment_templates_list_only</a><br />
-<a href="/services/proton/service_templates/">service_templates</a><br />
-<a href="/services/proton/service_templates_list_only/">service_templates_list_only</a>
+<a href="/services/proton/service_templates/">service_templates</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/proton/service_templates/index.md b/website/docs/services/proton/service_templates/index.md
index ba14afc45..4ff0b15bc 100644
--- a/website/docs/services/proton/service_templates/index.md
+++ b/website/docs/services/proton/service_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>service_template</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>service_template</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "<p>The Amazon Resource Name (ARN) of the service template.</p>"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-proton-servicetemplate.html"><code>AWS::Proton::ServiceTemplate</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>service_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>service_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>service_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>service_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>service_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>service_template</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.proton.service_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>service_templates</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.proton.service_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -235,6 +289,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.proton.service_templates
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "DisplayName": display_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/proton/service_templates_list_only/index.md b/website/docs/services/proton/service_templates_list_only/index.md
deleted file mode 100644
index 696b462ee..000000000
--- a/website/docs/services/proton/service_templates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: service_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - service_templates_list_only
-  - proton
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>service_templates</code> in a region or regions, for all properties use <a href="/services/proton/service_templates/"><code>service_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>service_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Proton::ServiceTemplate Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.proton.service_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "<p>The Amazon Resource Name (ARN) of the service template.</p>"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>service_templates</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.proton.service_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>service_templates_list_only</code> resource, see <a href="/services/proton/service_templates/#permissions"><code>service_templates</code></a>
-
diff --git a/website/docs/services/qbusiness/applications/index.md b/website/docs/services/qbusiness/applications/index.md
index 6214e5b2a..34148f7d8 100644
--- a/website/docs/services/qbusiness/applications/index.md
+++ b/website/docs/services/qbusiness/applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "application_arn",
@@ -199,6 +208,23 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-application.html"><code>AWS::QBusiness::Application</code></a>.
 
@@ -208,31 +234,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DisplayName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -241,6 +273,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application</code>.
 ```sql
 SELECT
@@ -268,6 +309,19 @@ updated_at
 FROM awscc.qbusiness.applications
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>applications</code> in a region.
+```sql
+SELECT
+region,
+application_id
+FROM awscc.qbusiness.applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -390,6 +444,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.qbusiness.applications
+SET data__PatchDocument = string('{{ {
+    "AttachmentsConfiguration": attachments_configuration,
+    "AutoSubscriptionConfiguration": auto_subscription_configuration,
+    "Description": description,
+    "DisplayName": display_name,
+    "IdentityCenterInstanceArn": identity_center_instance_arn,
+    "PersonalizationConfiguration": personalization_configuration,
+    "QAppsConfiguration": q_apps_configuration,
+    "RoleArn": role_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/qbusiness/applications_list_only/index.md b/website/docs/services/qbusiness/applications_list_only/index.md
deleted file mode 100644
index 522a47669..000000000
--- a/website/docs/services/qbusiness/applications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - applications_list_only
-  - qbusiness
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>applications</code> in a region or regions, for all properties use <a href="/services/qbusiness/applications/"><code>applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::QBusiness::Application Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.qbusiness.applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>applications</code> in a region.
-```sql
-SELECT
-region,
-application_id
-FROM awscc.qbusiness.applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>applications_list_only</code> resource, see <a href="/services/qbusiness/applications/#permissions"><code>applications</code></a>
-
diff --git a/website/docs/services/qbusiness/data_accessors/index.md b/website/docs/services/qbusiness/data_accessors/index.md
index 5c99d5bb9..92f0c2255 100644
--- a/website/docs/services/qbusiness/data_accessors/index.md
+++ b/website/docs/services/qbusiness/data_accessors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_accessor</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "action_configurations",
@@ -160,6 +169,28 @@ Creates, updates, deletes or gets a <code>data_accessor</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "data_accessor_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-dataaccessor.html"><code>AWS::QBusiness::DataAccessor</code></a>.
 
@@ -169,31 +200,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_accessors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApplicationId, ActionConfigurations, DisplayName, Principal, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_accessors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_accessors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_accessors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_accessors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -202,6 +239,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_accessor</code>.
 ```sql
 SELECT
@@ -220,6 +266,20 @@ updated_at
 FROM awscc.qbusiness.data_accessors
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationId>|<DataAccessorId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_accessors</code> in a region.
+```sql
+SELECT
+region,
+application_id,
+data_accessor_id
+FROM awscc.qbusiness.data_accessors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -329,6 +389,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.qbusiness.data_accessors
+SET data__PatchDocument = string('{{ {
+    "ActionConfigurations": action_configurations,
+    "AuthenticationDetail": authentication_detail,
+    "DisplayName": display_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationId>|<DataAccessorId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/qbusiness/data_accessors_list_only/index.md b/website/docs/services/qbusiness/data_accessors_list_only/index.md
deleted file mode 100644
index 3c02e73ad..000000000
--- a/website/docs/services/qbusiness/data_accessors_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: data_accessors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_accessors_list_only
-  - qbusiness
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_accessors</code> in a region or regions, for all properties use <a href="/services/qbusiness/data_accessors/"><code>data_accessors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_accessors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::QBusiness::DataAccessor Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.qbusiness.data_accessors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "data_accessor_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_accessors</code> in a region.
-```sql
-SELECT
-region,
-application_id,
-data_accessor_id
-FROM awscc.qbusiness.data_accessors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_accessors_list_only</code> resource, see <a href="/services/qbusiness/data_accessors/#permissions"><code>data_accessors</code></a>
-
diff --git a/website/docs/services/qbusiness/data_sources/index.md b/website/docs/services/qbusiness/data_sources/index.md
index 82d942894..1b67b7efd 100644
--- a/website/docs/services/qbusiness/data_sources/index.md
+++ b/website/docs/services/qbusiness/data_sources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "application_id",
@@ -289,6 +298,33 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "data_source_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "index_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-datasource.html"><code>AWS::QBusiness::DataSource</code></a>.
 
@@ -298,31 +334,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApplicationId, IndexId, Configuration, DisplayName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_sources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -331,6 +373,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_source</code>.
 ```sql
 SELECT
@@ -355,6 +406,21 @@ vpc_configuration
 FROM awscc.qbusiness.data_sources
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationId>|<DataSourceId>|<IndexId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_sources</code> in a region.
+```sql
+SELECT
+region,
+application_id,
+data_source_id,
+index_id
+FROM awscc.qbusiness.data_sources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -489,6 +555,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.qbusiness.data_sources
+SET data__PatchDocument = string('{{ {
+    "Configuration": configuration,
+    "Description": description,
+    "DisplayName": display_name,
+    "DocumentEnrichmentConfiguration": document_enrichment_configuration,
+    "MediaExtractionConfiguration": media_extraction_configuration,
+    "RoleArn": role_arn,
+    "SyncSchedule": sync_schedule,
+    "Tags": tags,
+    "VpcConfiguration": vpc_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationId>|<DataSourceId>|<IndexId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/qbusiness/data_sources_list_only/index.md b/website/docs/services/qbusiness/data_sources_list_only/index.md
deleted file mode 100644
index 91c228b3f..000000000
--- a/website/docs/services/qbusiness/data_sources_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: data_sources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_sources_list_only
-  - qbusiness
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_sources</code> in a region or regions, for all properties use <a href="/services/qbusiness/data_sources/"><code>data_sources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_sources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::QBusiness::DataSource Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.qbusiness.data_sources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "data_source_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "index_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_sources</code> in a region.
-```sql
-SELECT
-region,
-application_id,
-data_source_id,
-index_id
-FROM awscc.qbusiness.data_sources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_sources_list_only</code> resource, see <a href="/services/qbusiness/data_sources/#permissions"><code>data_sources</code></a>
-
diff --git a/website/docs/services/qbusiness/index.md b/website/docs/services/qbusiness/index.md
index 2e3387f74..685fd94ed 100644
--- a/website/docs/services/qbusiness/index.md
+++ b/website/docs/services/qbusiness/index.md
@@ -20,7 +20,7 @@ The qbusiness service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>16</b></span><br />
+<span>total resources:&nbsp;<b>8</b></span><br />
 </div>
 </div>
 
@@ -30,22 +30,14 @@ The qbusiness service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/qbusiness/applications/">applications</a><br />
-<a href="/services/qbusiness/applications_list_only/">applications_list_only</a><br />
 <a href="/services/qbusiness/data_accessors/">data_accessors</a><br />
-<a href="/services/qbusiness/data_accessors_list_only/">data_accessors_list_only</a><br />
 <a href="/services/qbusiness/data_sources/">data_sources</a><br />
-<a href="/services/qbusiness/data_sources_list_only/">data_sources_list_only</a><br />
-<a href="/services/qbusiness/indices/">indices</a><br />
-<a href="/services/qbusiness/indices_list_only/">indices_list_only</a>
+<a href="/services/qbusiness/indices/">indices</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/qbusiness/permissions/">permissions</a><br />
-<a href="/services/qbusiness/permissions_list_only/">permissions_list_only</a><br />
 <a href="/services/qbusiness/plugins/">plugins</a><br />
-<a href="/services/qbusiness/plugins_list_only/">plugins_list_only</a><br />
 <a href="/services/qbusiness/retrievers/">retrievers</a><br />
-<a href="/services/qbusiness/retrievers_list_only/">retrievers_list_only</a><br />
-<a href="/services/qbusiness/web_experiences/">web_experiences</a><br />
-<a href="/services/qbusiness/web_experiences_list_only/">web_experiences_list_only</a>
+<a href="/services/qbusiness/web_experiences/">web_experiences</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/qbusiness/indices/index.md b/website/docs/services/qbusiness/indices/index.md
index a6e0bf766..159d77e01 100644
--- a/website/docs/services/qbusiness/indices/index.md
+++ b/website/docs/services/qbusiness/indices/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>index</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "application_id",
@@ -160,6 +169,28 @@ Creates, updates, deletes or gets an <code>index</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "index_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-index.html"><code>AWS::QBusiness::Index</code></a>.
 
@@ -169,31 +200,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApplicationId, DisplayName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>indices_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -202,6 +239,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>index</code>.
 ```sql
 SELECT
@@ -222,6 +268,20 @@ updated_at
 FROM awscc.qbusiness.indices
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationId>|<IndexId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>indices</code> in a region.
+```sql
+SELECT
+region,
+application_id,
+index_id
+FROM awscc.qbusiness.indices_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -314,6 +374,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.qbusiness.indices
+SET data__PatchDocument = string('{{ {
+    "CapacityConfiguration": capacity_configuration,
+    "Description": description,
+    "DisplayName": display_name,
+    "DocumentAttributeConfigurations": document_attribute_configurations,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationId>|<IndexId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/qbusiness/indices_list_only/index.md b/website/docs/services/qbusiness/indices_list_only/index.md
deleted file mode 100644
index 9c1c21787..000000000
--- a/website/docs/services/qbusiness/indices_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: indices_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - indices_list_only
-  - qbusiness
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>indices</code> in a region or regions, for all properties use <a href="/services/qbusiness/indices/"><code>indices</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>indices_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::QBusiness::Index Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.qbusiness.indices_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "index_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>indices</code> in a region.
-```sql
-SELECT
-region,
-application_id,
-index_id
-FROM awscc.qbusiness.indices_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>indices_list_only</code> resource, see <a href="/services/qbusiness/indices/#permissions"><code>indices</code></a>
-
diff --git a/website/docs/services/qbusiness/permissions/index.md b/website/docs/services/qbusiness/permissions/index.md
index 7c5d6ef9c..a7597e8a9 100644
--- a/website/docs/services/qbusiness/permissions/index.md
+++ b/website/docs/services/qbusiness/permissions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>permission</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "application_id",
@@ -82,6 +91,28 @@ Creates, updates, deletes or gets a <code>permission</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "statement_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-permission.html"><code>AWS::QBusiness::Permission</code></a>.
 
@@ -91,26 +122,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>permissions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApplicationId, StatementId, Actions, Principal, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>permissions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>permissions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>permissions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +155,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>permission</code>.
 ```sql
 SELECT
@@ -131,6 +176,20 @@ principal
 FROM awscc.qbusiness.permissions
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationId>|<StatementId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>permissions</code> in a region.
+```sql
+SELECT
+region,
+application_id,
+statement_id
+FROM awscc.qbusiness.permissions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -218,6 +277,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/qbusiness/permissions_list_only/index.md b/website/docs/services/qbusiness/permissions_list_only/index.md
deleted file mode 100644
index 7b8e9fd43..000000000
--- a/website/docs/services/qbusiness/permissions_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: permissions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - permissions_list_only
-  - qbusiness
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>permissions</code> in a region or regions, for all properties use <a href="/services/qbusiness/permissions/"><code>permissions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>permissions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::QBusiness::Permission Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.qbusiness.permissions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "statement_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>permissions</code> in a region.
-```sql
-SELECT
-region,
-application_id,
-statement_id
-FROM awscc.qbusiness.permissions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>permissions_list_only</code> resource, see <a href="/services/qbusiness/permissions/#permissions"><code>permissions</code></a>
-
diff --git a/website/docs/services/qbusiness/plugins/index.md b/website/docs/services/qbusiness/plugins/index.md
index 97b3b0930..d1257bbcc 100644
--- a/website/docs/services/qbusiness/plugins/index.md
+++ b/website/docs/services/qbusiness/plugins/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>plugin</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "application_id",
@@ -134,6 +143,28 @@ Creates, updates, deletes or gets a <code>plugin</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "plugin_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-plugin.html"><code>AWS::QBusiness::Plugin</code></a>.
 
@@ -143,31 +174,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>plugins</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AuthConfiguration, DisplayName, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>plugins</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>plugins</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>plugins_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>plugins</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -176,6 +213,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>plugin</code>.
 ```sql
 SELECT
@@ -196,6 +242,20 @@ updated_at
 FROM awscc.qbusiness.plugins
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationId>|<PluginId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>plugins</code> in a region.
+```sql
+SELECT
+region,
+application_id,
+plugin_id
+FROM awscc.qbusiness.plugins_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -293,6 +353,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.qbusiness.plugins
+SET data__PatchDocument = string('{{ {
+    "AuthConfiguration": auth_configuration,
+    "CustomPluginConfiguration": custom_plugin_configuration,
+    "DisplayName": display_name,
+    "ServerUrl": server_url,
+    "State": state,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationId>|<PluginId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/qbusiness/plugins_list_only/index.md b/website/docs/services/qbusiness/plugins_list_only/index.md
deleted file mode 100644
index 0f2e88b56..000000000
--- a/website/docs/services/qbusiness/plugins_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: plugins_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - plugins_list_only
-  - qbusiness
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>plugins</code> in a region or regions, for all properties use <a href="/services/qbusiness/plugins/"><code>plugins</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>plugins_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::QBusiness::Plugin Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.qbusiness.plugins_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "plugin_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>plugins</code> in a region.
-```sql
-SELECT
-region,
-application_id,
-plugin_id
-FROM awscc.qbusiness.plugins_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>plugins_list_only</code> resource, see <a href="/services/qbusiness/plugins/#permissions"><code>plugins</code></a>
-
diff --git a/website/docs/services/qbusiness/retrievers/index.md b/website/docs/services/qbusiness/retrievers/index.md
index 603ff85bc..82d3144bb 100644
--- a/website/docs/services/qbusiness/retrievers/index.md
+++ b/website/docs/services/qbusiness/retrievers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>retriever</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "application_id",
@@ -107,6 +116,28 @@ Creates, updates, deletes or gets a <code>retriever</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "retriever_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-retriever.html"><code>AWS::QBusiness::Retriever</code></a>.
 
@@ -116,31 +147,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>retrievers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApplicationId, Configuration, DisplayName, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>retrievers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>retrievers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>retrievers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>retrievers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -149,6 +186,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>retriever</code>.
 ```sql
 SELECT
@@ -167,6 +213,20 @@ updated_at
 FROM awscc.qbusiness.retrievers
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationId>|<RetrieverId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>retrievers</code> in a region.
+```sql
+SELECT
+region,
+application_id,
+retriever_id
+FROM awscc.qbusiness.retrievers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -255,6 +315,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.qbusiness.retrievers
+SET data__PatchDocument = string('{{ {
+    "Configuration": configuration,
+    "DisplayName": display_name,
+    "RoleArn": role_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationId>|<RetrieverId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/qbusiness/retrievers_list_only/index.md b/website/docs/services/qbusiness/retrievers_list_only/index.md
deleted file mode 100644
index ed91059cd..000000000
--- a/website/docs/services/qbusiness/retrievers_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: retrievers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - retrievers_list_only
-  - qbusiness
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>retrievers</code> in a region or regions, for all properties use <a href="/services/qbusiness/retrievers/"><code>retrievers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>retrievers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::QBusiness::Retriever Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.qbusiness.retrievers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "retriever_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>retrievers</code> in a region.
-```sql
-SELECT
-region,
-application_id,
-retriever_id
-FROM awscc.qbusiness.retrievers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>retrievers_list_only</code> resource, see <a href="/services/qbusiness/retrievers/#permissions"><code>retrievers</code></a>
-
diff --git a/website/docs/services/qbusiness/web_experiences/index.md b/website/docs/services/qbusiness/web_experiences/index.md
index 12aa0a34e..8eb6037d9 100644
--- a/website/docs/services/qbusiness/web_experiences/index.md
+++ b/website/docs/services/qbusiness/web_experiences/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>web_experience</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "application_id",
@@ -166,6 +175,28 @@ Creates, updates, deletes or gets a <code>web_experience</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "web_experience_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-webexperience.html"><code>AWS::QBusiness::WebExperience</code></a>.
 
@@ -175,31 +206,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>web_experiences</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApplicationId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>web_experiences</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>web_experiences</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>web_experiences_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>web_experiences</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -208,6 +245,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>web_experience</code>.
 ```sql
 SELECT
@@ -232,6 +278,20 @@ browser_extension_configuration
 FROM awscc.qbusiness.web_experiences
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationId>|<WebExperienceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>web_experiences</code> in a region.
+```sql
+SELECT
+region,
+application_id,
+web_experience_id
+FROM awscc.qbusiness.web_experiences_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -341,6 +401,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.qbusiness.web_experiences
+SET data__PatchDocument = string('{{ {
+    "IdentityProviderConfiguration": identity_provider_configuration,
+    "RoleArn": role_arn,
+    "SamplePromptsControlMode": sample_prompts_control_mode,
+    "Subtitle": subtitle,
+    "Tags": tags,
+    "Title": title,
+    "WelcomeMessage": welcome_message,
+    "Origins": origins,
+    "CustomizationConfiguration": customization_configuration,
+    "BrowserExtensionConfiguration": browser_extension_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationId>|<WebExperienceId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/qbusiness/web_experiences_list_only/index.md b/website/docs/services/qbusiness/web_experiences_list_only/index.md
deleted file mode 100644
index f319fcf06..000000000
--- a/website/docs/services/qbusiness/web_experiences_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: web_experiences_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - web_experiences_list_only
-  - qbusiness
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>web_experiences</code> in a region or regions, for all properties use <a href="/services/qbusiness/web_experiences/"><code>web_experiences</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>web_experiences_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::QBusiness::WebExperience Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.qbusiness.web_experiences_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "web_experience_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>web_experiences</code> in a region.
-```sql
-SELECT
-region,
-application_id,
-web_experience_id
-FROM awscc.qbusiness.web_experiences_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>web_experiences_list_only</code> resource, see <a href="/services/qbusiness/web_experiences/#permissions"><code>web_experiences</code></a>
-
diff --git a/website/docs/services/qldb/index.md b/website/docs/services/qldb/index.md
index 6ccf099ad..6dac5e048 100644
--- a/website/docs/services/qldb/index.md
+++ b/website/docs/services/qldb/index.md
@@ -20,7 +20,7 @@ The qldb service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The qldb service documentation.
 <a href="/services/qldb/streams/">streams</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/qldb/streams_list_only/">streams_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/qldb/streams/index.md b/website/docs/services/qldb/streams/index.md
index 807d50ea0..4118d869f 100644
--- a/website/docs/services/qldb/streams/index.md
+++ b/website/docs/services/qldb/streams/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>stream</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ledger_name",
@@ -99,6 +108,28 @@ Creates, updates, deletes or gets a <code>stream</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "ledger_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-stream.html"><code>AWS::QLDB::Stream</code></a>.
 
@@ -108,31 +139,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>streams</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LedgerName, StreamName, RoleArn, KinesisConfiguration, InclusiveStartTime, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>streams</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>streams</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>streams_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>streams</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +178,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>stream</code>.
 ```sql
 SELECT
@@ -157,6 +203,20 @@ id
 FROM awscc.qldb.streams
 WHERE region = 'us-east-1' AND data__Identifier = '<LedgerName>|<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>streams</code> in a region.
+```sql
+SELECT
+region,
+ledger_name,
+id
+FROM awscc.qldb.streams_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -253,6 +313,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.qldb.streams
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<LedgerName>|<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/qldb/streams_list_only/index.md b/website/docs/services/qldb/streams_list_only/index.md
deleted file mode 100644
index b3743d53c..000000000
--- a/website/docs/services/qldb/streams_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: streams_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - streams_list_only
-  - qldb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>streams</code> in a region or regions, for all properties use <a href="/services/qldb/streams/"><code>streams</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>streams_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::QLDB::Stream.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.qldb.streams_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "ledger_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>streams</code> in a region.
-```sql
-SELECT
-region,
-ledger_name,
-id
-FROM awscc.qldb.streams_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>streams_list_only</code> resource, see <a href="/services/qldb/streams/#permissions"><code>streams</code></a>
-
diff --git a/website/docs/services/quicksight/analyses/index.md b/website/docs/services/quicksight/analyses/index.md
index c8c4cc75c..24f26c9a8 100644
--- a/website/docs/services/quicksight/analyses/index.md
+++ b/website/docs/services/quicksight/analyses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>analysis</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "status",
@@ -1048,6 +1057,28 @@ Creates, updates, deletes or gets an <code>analysis</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "analysis_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "aws_account_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-analysis.html"><code>AWS::QuickSight::Analysis</code></a>.
 
@@ -1057,31 +1088,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>analyses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AwsAccountId, AnalysisId, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>analyses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>analyses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>analyses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>analyses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -1090,6 +1127,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>analysis</code>.
 ```sql
 SELECT
@@ -1115,6 +1161,20 @@ sheets
 FROM awscc.quicksight.analyses
 WHERE region = 'us-east-1' AND data__Identifier = '<AnalysisId>|<AwsAccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>analyses</code> in a region.
+```sql
+SELECT
+region,
+analysis_id,
+aws_account_id
+FROM awscc.quicksight.analyses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -3152,6 +3212,30 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.quicksight.analyses
+SET data__PatchDocument = string('{{ {
+    "Status": status,
+    "Parameters": parameters,
+    "SourceEntity": source_entity,
+    "ThemeArn": theme_arn,
+    "Definition": definition,
+    "ValidationStrategy": validation_strategy,
+    "FolderArns": folder_arns,
+    "Name": name,
+    "Errors": errors,
+    "Permissions": permissions,
+    "Tags": tags,
+    "Sheets": sheets
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AnalysisId>|<AwsAccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/quicksight/analyses_list_only/index.md b/website/docs/services/quicksight/analyses_list_only/index.md
deleted file mode 100644
index 07339dc91..000000000
--- a/website/docs/services/quicksight/analyses_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: analyses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - analyses_list_only
-  - quicksight
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>analyses</code> in a region or regions, for all properties use <a href="/services/quicksight/analyses/"><code>analyses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>analyses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of the AWS::QuickSight::Analysis Resource Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.quicksight.analyses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "analysis_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "aws_account_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>analyses</code> in a region.
-```sql
-SELECT
-region,
-analysis_id,
-aws_account_id
-FROM awscc.quicksight.analyses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>analyses_list_only</code> resource, see <a href="/services/quicksight/analyses/#permissions"><code>analyses</code></a>
-
diff --git a/website/docs/services/quicksight/custom_permissions/index.md b/website/docs/services/quicksight/custom_permissions/index.md
index d104f6f9f..e83b31074 100644
--- a/website/docs/services/quicksight/custom_permissions/index.md
+++ b/website/docs/services/quicksight/custom_permissions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>custom_permission</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -84,6 +93,28 @@ Creates, updates, deletes or gets a <code>custom_permission</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "aws_account_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "custom_permissions_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-custompermission.html"><code>AWS::QuickSight::CustomPermissions</code></a>.
 
@@ -93,31 +124,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>custom_permissions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AwsAccountId, CustomPermissionsName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>custom_permissions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>custom_permissions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>custom_permissions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>custom_permissions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -126,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>custom_permission</code>.
 ```sql
 SELECT
@@ -138,6 +184,20 @@ tags
 FROM awscc.quicksight.custom_permissions
 WHERE region = 'us-east-1' AND data__Identifier = '<AwsAccountId>|<CustomPermissionsName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>custom_permissions</code> in a region.
+```sql
+SELECT
+region,
+aws_account_id,
+custom_permissions_name
+FROM awscc.quicksight.custom_permissions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -237,6 +297,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.quicksight.custom_permissions
+SET data__PatchDocument = string('{{ {
+    "Capabilities": capabilities,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AwsAccountId>|<CustomPermissionsName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/quicksight/custom_permissions_list_only/index.md b/website/docs/services/quicksight/custom_permissions_list_only/index.md
deleted file mode 100644
index dcb479d23..000000000
--- a/website/docs/services/quicksight/custom_permissions_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: custom_permissions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - custom_permissions_list_only
-  - quicksight
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>custom_permissions</code> in a region or regions, for all properties use <a href="/services/quicksight/custom_permissions/"><code>custom_permissions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>custom_permissions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of the AWS::QuickSight::CustomPermissions Resource Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.quicksight.custom_permissions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "aws_account_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "custom_permissions_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>custom_permissions</code> in a region.
-```sql
-SELECT
-region,
-aws_account_id,
-custom_permissions_name
-FROM awscc.quicksight.custom_permissions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>custom_permissions_list_only</code> resource, see <a href="/services/quicksight/custom_permissions/#permissions"><code>custom_permissions</code></a>
-
diff --git a/website/docs/services/quicksight/dashboards/index.md b/website/docs/services/quicksight/dashboards/index.md
index d027b345b..e3c7a0c80 100644
--- a/website/docs/services/quicksight/dashboards/index.md
+++ b/website/docs/services/quicksight/dashboards/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>dashboard</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "created_time",
@@ -1258,6 +1267,28 @@ Creates, updates, deletes or gets a <code>dashboard</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "dashboard_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "aws_account_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dashboard.html"><code>AWS::QuickSight::Dashboard</code></a>.
 
@@ -1267,31 +1298,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AwsAccountId, DashboardId, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>dashboards_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>dashboards</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -1300,6 +1337,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dashboard</code>.
 ```sql
 SELECT
@@ -1327,6 +1373,20 @@ tags
 FROM awscc.quicksight.dashboards
 WHERE region = 'us-east-1' AND data__Identifier = '<AwsAccountId>|<DashboardId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>dashboards</code> in a region.
+```sql
+SELECT
+region,
+aws_account_id,
+dashboard_id
+FROM awscc.quicksight.dashboards_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -3385,6 +3445,31 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.quicksight.dashboards
+SET data__PatchDocument = string('{{ {
+    "Parameters": parameters,
+    "VersionDescription": version_description,
+    "SourceEntity": source_entity,
+    "ThemeArn": theme_arn,
+    "Definition": definition,
+    "ValidationStrategy": validation_strategy,
+    "FolderArns": folder_arns,
+    "LinkSharingConfiguration": link_sharing_configuration,
+    "Name": name,
+    "DashboardPublishOptions": dashboard_publish_options,
+    "Permissions": permissions,
+    "LinkEntities": link_entities,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AwsAccountId>|<DashboardId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/quicksight/dashboards_list_only/index.md b/website/docs/services/quicksight/dashboards_list_only/index.md
deleted file mode 100644
index 606fc9e2b..000000000
--- a/website/docs/services/quicksight/dashboards_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: dashboards_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - dashboards_list_only
-  - quicksight
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>dashboards</code> in a region or regions, for all properties use <a href="/services/quicksight/dashboards/"><code>dashboards</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>dashboards_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of the AWS::QuickSight::Dashboard Resource Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.quicksight.dashboards_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "dashboard_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "aws_account_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>dashboards</code> in a region.
-```sql
-SELECT
-region,
-aws_account_id,
-dashboard_id
-FROM awscc.quicksight.dashboards_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>dashboards_list_only</code> resource, see <a href="/services/quicksight/dashboards/#permissions"><code>dashboards</code></a>
-
diff --git a/website/docs/services/quicksight/data_sets/index.md b/website/docs/services/quicksight/data_sets/index.md
index 1b2681116..64bd42661 100644
--- a/website/docs/services/quicksight/data_sets/index.md
+++ b/website/docs/services/quicksight/data_sets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_set</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "created_time",
@@ -534,6 +543,28 @@ Creates, updates, deletes or gets a <code>data_set</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "data_set_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "aws_account_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html"><code>AWS::QuickSight::DataSet</code></a>.
 
@@ -543,31 +574,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_sets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_sets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_sets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_sets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_sets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -576,6 +613,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_set</code>.
 ```sql
 SELECT
@@ -608,6 +654,20 @@ arn
 FROM awscc.quicksight.data_sets
 WHERE region = 'us-east-1' AND data__Identifier = '<AwsAccountId>|<DataSetId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_sets</code> in a region.
+```sql
+SELECT
+region,
+aws_account_id,
+data_set_id
+FROM awscc.quicksight.data_sets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -855,6 +915,36 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.quicksight.data_sets
+SET data__PatchDocument = string('{{ {
+    "FolderArns": folder_arns,
+    "RowLevelPermissionDataSet": row_level_permission_data_set,
+    "IngestionWaitPolicy": ingestion_wait_policy,
+    "ColumnLevelPermissionRules": column_level_permission_rules,
+    "Name": name,
+    "Permissions": permissions,
+    "UseAs": use_as,
+    "Tags": tags,
+    "PhysicalTableMap": physical_table_map,
+    "FieldFolders": field_folders,
+    "PerformanceConfiguration": performance_configuration,
+    "DataSetRefreshProperties": data_set_refresh_properties,
+    "RowLevelPermissionTagConfiguration": row_level_permission_tag_configuration,
+    "ColumnGroups": column_groups,
+    "ImportMode": import_mode,
+    "DatasetParameters": dataset_parameters,
+    "LogicalTableMap": logical_table_map,
+    "DataSetUsageConfiguration": data_set_usage_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AwsAccountId>|<DataSetId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/quicksight/data_sets_list_only/index.md b/website/docs/services/quicksight/data_sets_list_only/index.md
deleted file mode 100644
index f601badc3..000000000
--- a/website/docs/services/quicksight/data_sets_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: data_sets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_sets_list_only
-  - quicksight
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_sets</code> in a region or regions, for all properties use <a href="/services/quicksight/data_sets/"><code>data_sets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_sets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of the AWS::QuickSight::DataSet Resource Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.quicksight.data_sets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "data_set_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "aws_account_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_sets</code> in a region.
-```sql
-SELECT
-region,
-aws_account_id,
-data_set_id
-FROM awscc.quicksight.data_sets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_sets_list_only</code> resource, see <a href="/services/quicksight/data_sets/#permissions"><code>data_sets</code></a>
-
diff --git a/website/docs/services/quicksight/data_sources/index.md b/website/docs/services/quicksight/data_sources/index.md
index 0c5cef072..c5755a3a7 100644
--- a/website/docs/services/quicksight/data_sources/index.md
+++ b/website/docs/services/quicksight/data_sources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "status",
@@ -763,6 +772,28 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "aws_account_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "data_source_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html"><code>AWS::QuickSight::DataSource</code></a>.
 
@@ -772,31 +803,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_sources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_sources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -805,6 +842,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_source</code>.
 ```sql
 SELECT
@@ -829,6 +875,20 @@ tags
 FROM awscc.quicksight.data_sources
 WHERE region = 'us-east-1' AND data__Identifier = '<AwsAccountId>|<DataSourceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_sources</code> in a region.
+```sql
+SELECT
+region,
+aws_account_id,
+data_source_id
+FROM awscc.quicksight.data_sources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1053,6 +1113,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.quicksight.data_sources
+SET data__PatchDocument = string('{{ {
+    "ErrorInfo": error_info,
+    "FolderArns": folder_arns,
+    "Name": name,
+    "DataSourceParameters": data_source_parameters,
+    "VpcConnectionProperties": vpc_connection_properties,
+    "AlternateDataSourceParameters": alternate_data_source_parameters,
+    "Permissions": permissions,
+    "SslProperties": ssl_properties,
+    "Credentials": credentials,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AwsAccountId>|<DataSourceId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/quicksight/data_sources_list_only/index.md b/website/docs/services/quicksight/data_sources_list_only/index.md
deleted file mode 100644
index b6cf05014..000000000
--- a/website/docs/services/quicksight/data_sources_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: data_sources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_sources_list_only
-  - quicksight
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_sources</code> in a region or regions, for all properties use <a href="/services/quicksight/data_sources/"><code>data_sources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_sources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of the AWS::QuickSight::DataSource Resource Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.quicksight.data_sources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "aws_account_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "data_source_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_sources</code> in a region.
-```sql
-SELECT
-region,
-aws_account_id,
-data_source_id
-FROM awscc.quicksight.data_sources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_sources_list_only</code> resource, see <a href="/services/quicksight/data_sources/#permissions"><code>data_sources</code></a>
-
diff --git a/website/docs/services/quicksight/folders/index.md b/website/docs/services/quicksight/folders/index.md
index 4348b61d7..c49609a28 100644
--- a/website/docs/services/quicksight/folders/index.md
+++ b/website/docs/services/quicksight/folders/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>folder</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -119,6 +128,28 @@ Creates, updates, deletes or gets a <code>folder</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "aws_account_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "folder_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-folder.html"><code>AWS::QuickSight::Folder</code></a>.
 
@@ -128,31 +159,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>folders</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>folders</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>folders</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>folders_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>folders</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +198,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>folder</code>.
 ```sql
 SELECT
@@ -179,6 +225,20 @@ tags
 FROM awscc.quicksight.folders
 WHERE region = 'us-east-1' AND data__Identifier = '<AwsAccountId>|<FolderId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>folders</code> in a region.
+```sql
+SELECT
+region,
+aws_account_id,
+folder_id
+FROM awscc.quicksight.folders_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -286,6 +346,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.quicksight.folders
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Permissions": permissions,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AwsAccountId>|<FolderId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/quicksight/folders_list_only/index.md b/website/docs/services/quicksight/folders_list_only/index.md
deleted file mode 100644
index f91406c3a..000000000
--- a/website/docs/services/quicksight/folders_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: folders_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - folders_list_only
-  - quicksight
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>folders</code> in a region or regions, for all properties use <a href="/services/quicksight/folders/"><code>folders</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>folders_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of the AWS::QuickSight::Folder Resource Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.quicksight.folders_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "aws_account_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "folder_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>folders</code> in a region.
-```sql
-SELECT
-region,
-aws_account_id,
-folder_id
-FROM awscc.quicksight.folders_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>folders_list_only</code> resource, see <a href="/services/quicksight/folders/#permissions"><code>folders</code></a>
-
diff --git a/website/docs/services/quicksight/index.md b/website/docs/services/quicksight/index.md
index 827702972..272629a94 100644
--- a/website/docs/services/quicksight/index.md
+++ b/website/docs/services/quicksight/index.md
@@ -20,7 +20,7 @@ The quicksight service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>22</b></span><br />
+<span>total resources:&nbsp;<b>11</b></span><br />
 </div>
 </div>
 
@@ -30,28 +30,17 @@ The quicksight service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/quicksight/analyses/">analyses</a><br />
-<a href="/services/quicksight/analyses_list_only/">analyses_list_only</a><br />
 <a href="/services/quicksight/custom_permissions/">custom_permissions</a><br />
-<a href="/services/quicksight/custom_permissions_list_only/">custom_permissions_list_only</a><br />
 <a href="/services/quicksight/dashboards/">dashboards</a><br />
-<a href="/services/quicksight/dashboards_list_only/">dashboards_list_only</a><br />
 <a href="/services/quicksight/data_sets/">data_sets</a><br />
-<a href="/services/quicksight/data_sets_list_only/">data_sets_list_only</a><br />
 <a href="/services/quicksight/data_sources/">data_sources</a><br />
-<a href="/services/quicksight/data_sources_list_only/">data_sources_list_only</a><br />
 <a href="/services/quicksight/folders/">folders</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/quicksight/folders_list_only/">folders_list_only</a><br />
 <a href="/services/quicksight/refresh_schedules/">refresh_schedules</a><br />
-<a href="/services/quicksight/refresh_schedules_list_only/">refresh_schedules_list_only</a><br />
 <a href="/services/quicksight/templates/">templates</a><br />
-<a href="/services/quicksight/templates_list_only/">templates_list_only</a><br />
 <a href="/services/quicksight/themes/">themes</a><br />
-<a href="/services/quicksight/themes_list_only/">themes_list_only</a><br />
 <a href="/services/quicksight/topics/">topics</a><br />
-<a href="/services/quicksight/topics_list_only/">topics_list_only</a><br />
-<a href="/services/quicksight/vpc_connections/">vpc_connections</a><br />
-<a href="/services/quicksight/vpc_connections_list_only/">vpc_connections_list_only</a>
+<a href="/services/quicksight/vpc_connections/">vpc_connections</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/quicksight/refresh_schedules/index.md b/website/docs/services/quicksight/refresh_schedules/index.md
index a075e99ee..36aad0d03 100644
--- a/website/docs/services/quicksight/refresh_schedules/index.md
+++ b/website/docs/services/quicksight/refresh_schedules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>refresh_schedule</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -116,6 +125,89 @@ Creates, updates, deletes or gets a <code>refresh_schedule</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "aws_account_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "data_set_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "schedule",
+    "type": "object",
+    "description": "",
+    "children": [
+      {
+        "name": "schedule_id",
+        "type": "string",
+        "description": "<p>An unique identifier for the refresh schedule.</p>"
+      },
+      {
+        "name": "schedule_frequency",
+        "type": "object",
+        "description": "<p>Information about the schedule frequency.</p>",
+        "children": [
+          {
+            "name": "interval",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "refresh_on_day",
+            "type": "object",
+            "description": "<p>The day scheduled for refresh.</p>",
+            "children": [
+              {
+                "name": "day_of_week",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "day_of_month",
+                "type": "string",
+                "description": "<p>The Day Of Month for scheduled refresh.</p>"
+              }
+            ]
+          },
+          {
+            "name": "time_zone",
+            "type": "string",
+            "description": "<p>The timezone for scheduled refresh.</p>"
+          },
+          {
+            "name": "time_of_the_day",
+            "type": "string",
+            "description": "<p>The time of the day for scheduled refresh.</p>"
+          }
+        ]
+      },
+      {
+        "name": "start_after_date_time",
+        "type": "string",
+        "description": "<p>The date time after which refresh is to be scheduled</p>"
+      },
+      {
+        "name": "refresh_type",
+        "type": "string",
+        "description": ""
+      }
+    ]
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-refreshschedule.html"><code>AWS::QuickSight::RefreshSchedule</code></a>.
 
@@ -125,31 +217,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>refresh_schedules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>refresh_schedules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>refresh_schedules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>refresh_schedules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>refresh_schedules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -158,6 +256,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>refresh_schedule</code>.
 ```sql
 SELECT
@@ -169,6 +276,21 @@ schedule
 FROM awscc.quicksight.refresh_schedules
 WHERE region = 'us-east-1' AND data__Identifier = '<AwsAccountId>|<DataSetId>|<Schedule/ScheduleId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>refresh_schedules</code> in a region.
+```sql
+SELECT
+region,
+aws_account_id,
+data_set_id,
+schedule/schedule_id
+FROM awscc.quicksight.refresh_schedules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -247,6 +369,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/quicksight/refresh_schedules_list_only/index.md b/website/docs/services/quicksight/refresh_schedules_list_only/index.md
deleted file mode 100644
index 653a6c7f4..000000000
--- a/website/docs/services/quicksight/refresh_schedules_list_only/index.md
+++ /dev/null
@@ -1,148 +0,0 @@
----
-title: refresh_schedules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - refresh_schedules_list_only
-  - quicksight
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>refresh_schedules</code> in a region or regions, for all properties use <a href="/services/quicksight/refresh_schedules/"><code>refresh_schedules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>refresh_schedules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of the AWS::QuickSight::RefreshSchedule Resource Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.quicksight.refresh_schedules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "aws_account_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "data_set_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "schedule",
-    "type": "object",
-    "description": "",
-    "children": [
-      {
-        "name": "schedule_id",
-        "type": "string",
-        "description": "<p>An unique identifier for the refresh schedule.</p>"
-      },
-      {
-        "name": "schedule_frequency",
-        "type": "object",
-        "description": "<p>Information about the schedule frequency.</p>",
-        "children": [
-          {
-            "name": "interval",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "refresh_on_day",
-            "type": "object",
-            "description": "<p>The day scheduled for refresh.</p>",
-            "children": [
-              {
-                "name": "day_of_week",
-                "type": "string",
-                "description": ""
-              },
-              {
-                "name": "day_of_month",
-                "type": "string",
-                "description": "<p>The Day Of Month for scheduled refresh.</p>"
-              }
-            ]
-          },
-          {
-            "name": "time_zone",
-            "type": "string",
-            "description": "<p>The timezone for scheduled refresh.</p>"
-          },
-          {
-            "name": "time_of_the_day",
-            "type": "string",
-            "description": "<p>The time of the day for scheduled refresh.</p>"
-          }
-        ]
-      },
-      {
-        "name": "start_after_date_time",
-        "type": "string",
-        "description": "<p>The date time after which refresh is to be scheduled</p>"
-      },
-      {
-        "name": "refresh_type",
-        "type": "string",
-        "description": ""
-      }
-    ]
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>refresh_schedules</code> in a region.
-```sql
-SELECT
-region,
-aws_account_id,
-data_set_id,
-schedule/schedule_id
-FROM awscc.quicksight.refresh_schedules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>refresh_schedules_list_only</code> resource, see <a href="/services/quicksight/refresh_schedules/#permissions"><code>refresh_schedules</code></a>
-
diff --git a/website/docs/services/quicksight/templates/index.md b/website/docs/services/quicksight/templates/index.md
index a83ed6dcb..61a5b7fc0 100644
--- a/website/docs/services/quicksight/templates/index.md
+++ b/website/docs/services/quicksight/templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>template</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "created_time",
@@ -1031,6 +1040,28 @@ Creates, updates, deletes or gets a <code>template</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "aws_account_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "template_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-template.html"><code>AWS::QuickSight::Template</code></a>.
 
@@ -1040,31 +1071,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AwsAccountId, TemplateId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -1073,6 +1110,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>template</code>.
 ```sql
 SELECT
@@ -1093,6 +1139,20 @@ template_id
 FROM awscc.quicksight.templates
 WHERE region = 'us-east-1' AND data__Identifier = '<AwsAccountId>|<TemplateId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>templates</code> in a region.
+```sql
+SELECT
+region,
+aws_account_id,
+template_id
+FROM awscc.quicksight.templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -3082,6 +3142,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.quicksight.templates
+SET data__PatchDocument = string('{{ {
+    "VersionDescription": version_description,
+    "SourceEntity": source_entity,
+    "Definition": definition,
+    "ValidationStrategy": validation_strategy,
+    "Name": name,
+    "Permissions": permissions,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AwsAccountId>|<TemplateId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/quicksight/templates_list_only/index.md b/website/docs/services/quicksight/templates_list_only/index.md
deleted file mode 100644
index 242362051..000000000
--- a/website/docs/services/quicksight/templates_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - templates_list_only
-  - quicksight
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>templates</code> in a region or regions, for all properties use <a href="/services/quicksight/templates/"><code>templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of the AWS::QuickSight::Template Resource Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.quicksight.templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "aws_account_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "template_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>templates</code> in a region.
-```sql
-SELECT
-region,
-aws_account_id,
-template_id
-FROM awscc.quicksight.templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>templates_list_only</code> resource, see <a href="/services/quicksight/templates/#permissions"><code>templates</code></a>
-
diff --git a/website/docs/services/quicksight/themes/index.md b/website/docs/services/quicksight/themes/index.md
index caa87bb0c..cae78bf01 100644
--- a/website/docs/services/quicksight/themes/index.md
+++ b/website/docs/services/quicksight/themes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>theme</code> resource or lists <code>t
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -344,6 +353,28 @@ Creates, updates, deletes or gets a <code>theme</code> resource or lists <code>t
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "aws_account_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "theme_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-theme.html"><code>AWS::QuickSight::Theme</code></a>.
 
@@ -353,31 +384,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>themes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AwsAccountId, ThemeId, BaseThemeId, Configuration, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>themes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>themes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>themes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>themes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -386,6 +423,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>theme</code>.
 ```sql
 SELECT
@@ -406,6 +452,20 @@ version_description
 FROM awscc.quicksight.themes
 WHERE region = 'us-east-1' AND data__Identifier = '<ThemeId>|<AwsAccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>themes</code> in a region.
+```sql
+SELECT
+region,
+theme_id,
+aws_account_id
+FROM awscc.quicksight.themes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -542,6 +602,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.quicksight.themes
+SET data__PatchDocument = string('{{ {
+    "BaseThemeId": base_theme_id,
+    "Configuration": configuration,
+    "Name": name,
+    "Permissions": permissions,
+    "Tags": tags,
+    "VersionDescription": version_description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ThemeId>|<AwsAccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/quicksight/themes_list_only/index.md b/website/docs/services/quicksight/themes_list_only/index.md
deleted file mode 100644
index f3c77900e..000000000
--- a/website/docs/services/quicksight/themes_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: themes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - themes_list_only
-  - quicksight
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>themes</code> in a region or regions, for all properties use <a href="/services/quicksight/themes/"><code>themes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>themes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of the AWS::QuickSight::Theme Resource Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.quicksight.themes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "aws_account_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "theme_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>themes</code> in a region.
-```sql
-SELECT
-region,
-theme_id,
-aws_account_id
-FROM awscc.quicksight.themes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>themes_list_only</code> resource, see <a href="/services/quicksight/themes/#permissions"><code>themes</code></a>
-
diff --git a/website/docs/services/quicksight/topics/index.md b/website/docs/services/quicksight/topics/index.md
index 815ea2b56..c61065a27 100644
--- a/website/docs/services/quicksight/topics/index.md
+++ b/website/docs/services/quicksight/topics/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>topic</code> resource or lists <code>t
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -713,6 +722,28 @@ Creates, updates, deletes or gets a <code>topic</code> resource or lists <code>t
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "aws_account_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "topic_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-topic.html"><code>AWS::QuickSight::Topic</code></a>.
 
@@ -722,31 +753,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>topics</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>topics</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>topics</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>topics_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>topics</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -755,6 +792,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>topic</code>.
 ```sql
 SELECT
@@ -773,6 +819,20 @@ user_experience_version
 FROM awscc.quicksight.topics
 WHERE region = 'us-east-1' AND data__Identifier = '<AwsAccountId>|<TopicId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>topics</code> in a region.
+```sql
+SELECT
+region,
+aws_account_id,
+topic_id
+FROM awscc.quicksight.topics_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1028,6 +1088,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.quicksight.topics
+SET data__PatchDocument = string('{{ {
+    "ConfigOptions": config_options,
+    "CustomInstructions": custom_instructions,
+    "DataSets": data_sets,
+    "Description": description,
+    "Name": name,
+    "UserExperienceVersion": user_experience_version
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AwsAccountId>|<TopicId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/quicksight/topics_list_only/index.md b/website/docs/services/quicksight/topics_list_only/index.md
deleted file mode 100644
index 92ee60135..000000000
--- a/website/docs/services/quicksight/topics_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: topics_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - topics_list_only
-  - quicksight
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>topics</code> in a region or regions, for all properties use <a href="/services/quicksight/topics/"><code>topics</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>topics_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of the AWS::QuickSight::Topic Resource Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.quicksight.topics_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "aws_account_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "topic_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>topics</code> in a region.
-```sql
-SELECT
-region,
-aws_account_id,
-topic_id
-FROM awscc.quicksight.topics_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>topics_list_only</code> resource, see <a href="/services/quicksight/topics/#permissions"><code>topics</code></a>
-
diff --git a/website/docs/services/quicksight/vpc_connections/index.md b/website/docs/services/quicksight/vpc_connections/index.md
index a988e22a7..4887f6a4e 100644
--- a/website/docs/services/quicksight/vpc_connections/index.md
+++ b/website/docs/services/quicksight/vpc_connections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>vpc_connection</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -154,6 +163,28 @@ Creates, updates, deletes or gets a <code>vpc_connection</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "aws_account_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "vpc_connection_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-vpcconnection.html"><code>AWS::QuickSight::VPCConnection</code></a>.
 
@@ -163,31 +194,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>vpc_connections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>vpc_connections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>vpc_connections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>vpc_connections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>vpc_connections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -196,6 +233,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>vpc_connection</code>.
 ```sql
 SELECT
@@ -218,6 +264,20 @@ vpc_id
 FROM awscc.quicksight.vpc_connections
 WHERE region = 'us-east-1' AND data__Identifier = '<AwsAccountId>|<VPCConnectionId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>vpc_connections</code> in a region.
+```sql
+SELECT
+region,
+aws_account_id,
+vpc_connection_id
+FROM awscc.quicksight.vpc_connections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -331,6 +391,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.quicksight.vpc_connections
+SET data__PatchDocument = string('{{ {
+    "AvailabilityStatus": availability_status,
+    "DnsResolvers": dns_resolvers,
+    "Name": name,
+    "RoleArn": role_arn,
+    "SecurityGroupIds": security_group_ids,
+    "SubnetIds": subnet_ids,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AwsAccountId>|<VPCConnectionId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/quicksight/vpc_connections_list_only/index.md b/website/docs/services/quicksight/vpc_connections_list_only/index.md
deleted file mode 100644
index 4e715be6c..000000000
--- a/website/docs/services/quicksight/vpc_connections_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: vpc_connections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - vpc_connections_list_only
-  - quicksight
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>vpc_connections</code> in a region or regions, for all properties use <a href="/services/quicksight/vpc_connections/"><code>vpc_connections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>vpc_connections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of the AWS::QuickSight::VPCConnection Resource Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.quicksight.vpc_connections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "aws_account_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "vpc_connection_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>vpc_connections</code> in a region.
-```sql
-SELECT
-region,
-aws_account_id,
-vpc_connection_id
-FROM awscc.quicksight.vpc_connections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>vpc_connections_list_only</code> resource, see <a href="/services/quicksight/vpc_connections/#permissions"><code>vpc_connections</code></a>
-
diff --git a/website/docs/services/ram/index.md b/website/docs/services/ram/index.md
index febeae0bc..3412d0d2a 100644
--- a/website/docs/services/ram/index.md
+++ b/website/docs/services/ram/index.md
@@ -20,7 +20,7 @@ The ram service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The ram service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/ram/permissions/">permissions</a><br />
-<a href="/services/ram/permissions_list_only/">permissions_list_only</a>
+<a href="/services/ram/permissions/">permissions</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/ram/resource_shares/">resource_shares</a><br />
-<a href="/services/ram/resource_shares_list_only/">resource_shares_list_only</a>
+<a href="/services/ram/resource_shares/">resource_shares</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/ram/permissions/index.md b/website/docs/services/ram/permissions/index.md
index e13bb940a..a3d2d0b90 100644
--- a/website/docs/services/ram/permissions/index.md
+++ b/website/docs/services/ram/permissions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>permission</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>permission</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ram-permission.html"><code>AWS::RAM::Permission</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>permissions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, ResourceType, PolicyTemplate, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>permissions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>permissions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>permissions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>permissions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>permission</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.ram.permissions
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>permissions</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ram.permissions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -227,6 +281,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ram.permissions
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ram/permissions_list_only/index.md b/website/docs/services/ram/permissions_list_only/index.md
deleted file mode 100644
index 1dcd1c03c..000000000
--- a/website/docs/services/ram/permissions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: permissions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - permissions_list_only
-  - ram
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>permissions</code> in a region or regions, for all properties use <a href="/services/ram/permissions/"><code>permissions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>permissions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::RAM::Permission</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ram.permissions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>permissions</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ram.permissions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>permissions_list_only</code> resource, see <a href="/services/ram/permissions/#permissions"><code>permissions</code></a>
-
diff --git a/website/docs/services/ram/resource_shares/index.md b/website/docs/services/ram/resource_shares/index.md
index 1c0d8fdea..0c13caab1 100644
--- a/website/docs/services/ram/resource_shares/index.md
+++ b/website/docs/services/ram/resource_shares/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_share</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "allow_external_principals",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets a <code>resource_share</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ram-resourceshare.html"><code>AWS::RAM::ResourceShare</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_shares</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_shares</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_shares</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_shares_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_shares</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_share</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.ram.resource_shares
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_shares</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ram.resource_shares_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -239,6 +293,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ram.resource_shares
+SET data__PatchDocument = string('{{ {
+    "AllowExternalPrincipals": allow_external_principals,
+    "Name": name,
+    "PermissionArns": permission_arns,
+    "Principals": principals,
+    "ResourceArns": resource_arns,
+    "Sources": sources,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ram/resource_shares_list_only/index.md b/website/docs/services/ram/resource_shares_list_only/index.md
deleted file mode 100644
index 03fe7d2d1..000000000
--- a/website/docs/services/ram/resource_shares_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_shares_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_shares_list_only
-  - ram
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_shares</code> in a region or regions, for all properties use <a href="/services/ram/resource_shares/"><code>resource_shares</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_shares_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::RAM::ResourceShare</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ram.resource_shares_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_shares</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ram.resource_shares_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_shares_list_only</code> resource, see <a href="/services/ram/resource_shares/#permissions"><code>resource_shares</code></a>
-
diff --git a/website/docs/services/rbin/index.md b/website/docs/services/rbin/index.md
index fbfa9ac7b..4d9d4b09b 100644
--- a/website/docs/services/rbin/index.md
+++ b/website/docs/services/rbin/index.md
@@ -20,7 +20,7 @@ The rbin service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The rbin service documentation.
 <a href="/services/rbin/rules/">rules</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/rbin/rules_list_only/">rules_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/rbin/rules/index.md b/website/docs/services/rbin/rules/index.md
index 63ba8023e..db19786bd 100644
--- a/website/docs/services/rbin/rules/index.md
+++ b/website/docs/services/rbin/rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>rule</code> resource or lists <code>ru
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -143,6 +152,23 @@ Creates, updates, deletes or gets a <code>rule</code> resource or lists <code>ru
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Rule Arn is unique for each rule."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rbin-rule.html"><code>AWS::Rbin::Rule</code></a>.
 
@@ -152,31 +178,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RetentionPeriod, ResourceType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -185,6 +217,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>rule</code>.
 ```sql
 SELECT
@@ -203,6 +244,19 @@ lock_state
 FROM awscc.rbin.rules
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>rules</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.rbin.rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -302,6 +356,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rbin.rules
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "ResourceTags": resource_tags,
+    "ExcludeResourceTags": exclude_resource_tags,
+    "Tags": tags,
+    "RetentionPeriod": retention_period,
+    "Status": status,
+    "LockConfiguration": lock_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rbin/rules_list_only/index.md b/website/docs/services/rbin/rules_list_only/index.md
deleted file mode 100644
index 8e124bac2..000000000
--- a/website/docs/services/rbin/rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - rules_list_only
-  - rbin
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>rules</code> in a region or regions, for all properties use <a href="/services/rbin/rules/"><code>rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Rbin::Rule</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rbin.rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Rule Arn is unique for each rule."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>rules</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.rbin.rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>rules_list_only</code> resource, see <a href="/services/rbin/rules/#permissions"><code>rules</code></a>
-
diff --git a/website/docs/services/rds/customdb_engine_versions/index.md b/website/docs/services/rds/customdb_engine_versions/index.md
index dcc18d4f3..e29f14e16 100644
--- a/website/docs/services/rds/customdb_engine_versions/index.md
+++ b/website/docs/services/rds/customdb_engine_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>customdb_engine_version</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "database_installation_files_s3_bucket_name",
@@ -117,6 +126,28 @@ Creates, updates, deletes or gets a <code>customdb_engine_version</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "engine",
+    "type": "string",
+    "description": "The database engine to use for your custom engine version (CEV).<br />Valid values:<br />+ &#96;&#96;custom-oracle-ee&#96;&#96; <br />+ &#96;&#96;custom-oracle-ee-cdb&#96;&#96;"
+  },
+  {
+    "name": "engine_version",
+    "type": "string",
+    "description": "The name of your CEV. The name format is &#96;&#96;major version.customized&#95;string&#96;&#96;. For example, a valid CEV name is &#96;&#96;19.my&#95;cev1&#96;&#96;. This setting is required for RDS Custom for Oracle, but optional for Amazon RDS. The combination of &#96;&#96;Engine&#96;&#96; and &#96;&#96;EngineVersion&#96;&#96; is unique per customer per Region.<br />&#42;Constraints:&#42; Minimum length is 1. Maximum length is 60.<br />&#42;Pattern:&#42;&#96;&#96;^&#91;a-z0-9&#95;.-&#93;&#123;1,60$&#96;&#96;&#125;"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-customdbengineversion.html"><code>AWS::RDS::CustomDBEngineVersion</code></a>.
 
@@ -126,31 +157,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>customdb_engine_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Engine, EngineVersion, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>customdb_engine_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>customdb_engine_versions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>customdb_engine_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>customdb_engine_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -159,6 +196,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>customdb_engine_version</code>.
 ```sql
 SELECT
@@ -179,6 +225,20 @@ tags
 FROM awscc.rds.customdb_engine_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<Engine>|<EngineVersion>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>customdb_engine_versions</code> in a region.
+```sql
+SELECT
+region,
+engine,
+engine_version
+FROM awscc.rds.customdb_engine_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -287,6 +347,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rds.customdb_engine_versions
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Status": status,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Engine>|<EngineVersion>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rds/customdb_engine_versions_list_only/index.md b/website/docs/services/rds/customdb_engine_versions_list_only/index.md
deleted file mode 100644
index 4ad14af1f..000000000
--- a/website/docs/services/rds/customdb_engine_versions_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: customdb_engine_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - customdb_engine_versions_list_only
-  - rds
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>customdb_engine_versions</code> in a region or regions, for all properties use <a href="/services/rds/customdb_engine_versions/"><code>customdb_engine_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>customdb_engine_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a custom DB engine version (CEV).</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rds.customdb_engine_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "engine",
-    "type": "string",
-    "description": "The database engine to use for your custom engine version (CEV).<br />Valid values:<br />+ &#96;&#96;custom-oracle-ee&#96;&#96; <br />+ &#96;&#96;custom-oracle-ee-cdb&#96;&#96;"
-  },
-  {
-    "name": "engine_version",
-    "type": "string",
-    "description": "The name of your CEV. The name format is &#96;&#96;major version.customized&#95;string&#96;&#96;. For example, a valid CEV name is &#96;&#96;19.my&#95;cev1&#96;&#96;. This setting is required for RDS Custom for Oracle, but optional for Amazon RDS. The combination of &#96;&#96;Engine&#96;&#96; and &#96;&#96;EngineVersion&#96;&#96; is unique per customer per Region.<br />&#42;Constraints:&#42; Minimum length is 1. Maximum length is 60.<br />&#42;Pattern:&#42;&#96;&#96;^&#91;a-z0-9&#95;.-&#93;&#123;1,60$&#96;&#96;&#125;"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>customdb_engine_versions</code> in a region.
-```sql
-SELECT
-region,
-engine,
-engine_version
-FROM awscc.rds.customdb_engine_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>customdb_engine_versions_list_only</code> resource, see <a href="/services/rds/customdb_engine_versions/#permissions"><code>customdb_engine_versions</code></a>
-
diff --git a/website/docs/services/rds/db_cluster_parameter_groups/index.md b/website/docs/services/rds/db_cluster_parameter_groups/index.md
index e804c9a33..a21ccb6a4 100644
--- a/website/docs/services/rds/db_cluster_parameter_groups/index.md
+++ b/website/docs/services/rds/db_cluster_parameter_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>db_cluster_parameter_group</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>db_cluster_parameter_group</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "db_cluster_parameter_group_name",
+    "type": "string",
+    "description": "The name of the DB cluster parameter group.<br />Constraints:<br />+ Must not match the name of an existing DB cluster parameter group.<br /><br />This value is stored as a lowercase string."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbclusterparametergroup.html"><code>AWS::RDS::DBClusterParameterGroup</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>db_cluster_parameter_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Description, Family, Parameters, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>db_cluster_parameter_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>db_cluster_parameter_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>db_cluster_parameter_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>db_cluster_parameter_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>db_cluster_parameter_group</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.rds.db_cluster_parameter_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<DBClusterParameterGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>db_cluster_parameter_groups</code> in a region.
+```sql
+SELECT
+region,
+db_cluster_parameter_group_name
+FROM awscc.rds.db_cluster_parameter_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -213,6 +267,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rds.db_cluster_parameter_groups
+SET data__PatchDocument = string('{{ {
+    "Parameters": parameters,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DBClusterParameterGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rds/db_cluster_parameter_groups_list_only/index.md b/website/docs/services/rds/db_cluster_parameter_groups_list_only/index.md
deleted file mode 100644
index 593c6ddd5..000000000
--- a/website/docs/services/rds/db_cluster_parameter_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: db_cluster_parameter_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - db_cluster_parameter_groups_list_only
-  - rds
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>db_cluster_parameter_groups</code> in a region or regions, for all properties use <a href="/services/rds/db_cluster_parameter_groups/"><code>db_cluster_parameter_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>db_cluster_parameter_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::RDS::DBClusterParameterGroup&#96;&#96; resource creates a new Amazon RDS DB cluster parameter group.<br />For information about configuring parameters for Amazon Aurora DB clusters, see &#91;Working with parameter groups&#93;(https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER&#95;WorkingWithParamGroups.html) in the &#42;Amazon Aurora User Guide&#42;.<br />If you apply a parameter group to a DB cluster, then its DB instances might need to reboot. This can result in an outage while the DB instances are rebooting.<br />If you apply a change to parameter group associated with a stopped DB cluster, then the updated stack waits until the DB cluster is started.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rds.db_cluster_parameter_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "db_cluster_parameter_group_name",
-    "type": "string",
-    "description": "The name of the DB cluster parameter group.<br />Constraints:<br />+ Must not match the name of an existing DB cluster parameter group.<br /><br />This value is stored as a lowercase string."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>db_cluster_parameter_groups</code> in a region.
-```sql
-SELECT
-region,
-db_cluster_parameter_group_name
-FROM awscc.rds.db_cluster_parameter_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>db_cluster_parameter_groups_list_only</code> resource, see <a href="/services/rds/db_cluster_parameter_groups/#permissions"><code>db_cluster_parameter_groups</code></a>
-
diff --git a/website/docs/services/rds/db_clusters/index.md b/website/docs/services/rds/db_clusters/index.md
index 2bd4e3829..294e51741 100644
--- a/website/docs/services/rds/db_clusters/index.md
+++ b/website/docs/services/rds/db_clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>db_cluster</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "endpoint",
@@ -474,6 +483,23 @@ Creates, updates, deletes or gets a <code>db_cluster</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "db_cluster_identifier",
+    "type": "string",
+    "description": "The DB cluster identifier. This parameter is stored as a lowercase string.<br />Constraints:<br />+ Must contain from 1 to 63 letters, numbers, or hyphens.<br />+ First character must be a letter.<br />+ Can't end with a hyphen or contain two consecutive hyphens.<br /><br />Example: &#96;&#96;my-cluster1&#96;&#96;<br />Valid for: Aurora DB clusters and Multi-AZ DB clusters"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html"><code>AWS::RDS::DBCluster</code></a>.
 
@@ -483,31 +509,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>db_clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>db_clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>db_clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>db_clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>db_clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -516,6 +548,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>db_cluster</code>.
 ```sql
 SELECT
@@ -588,6 +629,19 @@ vpc_security_group_ids
 FROM awscc.rds.db_clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<DBClusterIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>db_clusters</code> in a region.
+```sql
+SELECT
+region,
+db_cluster_identifier
+FROM awscc.rds.db_clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1020,6 +1074,60 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rds.db_clusters
+SET data__PatchDocument = string('{{ {
+    "AllocatedStorage": allocated_storage,
+    "AssociatedRoles": associated_roles,
+    "AutoMinorVersionUpgrade": auto_minor_version_upgrade,
+    "BacktrackWindow": backtrack_window,
+    "BackupRetentionPeriod": backup_retention_period,
+    "CopyTagsToSnapshot": copy_tags_to_snapshot,
+    "DatabaseInsightsMode": database_insights_mode,
+    "DBClusterInstanceClass": db_cluster_instance_class,
+    "DBInstanceParameterGroupName": db_instance_parameter_group_name,
+    "GlobalClusterIdentifier": global_cluster_identifier,
+    "DBClusterParameterGroupName": db_cluster_parameter_group_name,
+    "DeleteAutomatedBackups": delete_automated_backups,
+    "DeletionProtection": deletion_protection,
+    "Domain": domain,
+    "DomainIAMRoleName": domain_iam_role_name,
+    "EnableCloudwatchLogsExports": enable_cloudwatch_logs_exports,
+    "EnableGlobalWriteForwarding": enable_global_write_forwarding,
+    "EnableHttpEndpoint": enable_http_endpoint,
+    "EnableIAMDatabaseAuthentication": enable_iam_database_authentication,
+    "EnableLocalWriteForwarding": enable_local_write_forwarding,
+    "Engine": engine,
+    "EngineLifecycleSupport": engine_lifecycle_support,
+    "EngineVersion": engine_version,
+    "ManageMasterUserPassword": manage_master_user_password,
+    "Iops": iops,
+    "MasterUsername": master_username,
+    "MasterUserPassword": master_user_password,
+    "MonitoringInterval": monitoring_interval,
+    "MonitoringRoleArn": monitoring_role_arn,
+    "NetworkType": network_type,
+    "PerformanceInsightsEnabled": performance_insights_enabled,
+    "PerformanceInsightsKmsKeyId": performance_insights_kms_key_id,
+    "PerformanceInsightsRetentionPeriod": performance_insights_retention_period,
+    "Port": port,
+    "PreferredBackupWindow": preferred_backup_window,
+    "PreferredMaintenanceWindow": preferred_maintenance_window,
+    "ReplicationSourceIdentifier": replication_source_identifier,
+    "ServerlessV2ScalingConfiguration": serverless_v2_scaling_configuration,
+    "ScalingConfiguration": scaling_configuration,
+    "StorageType": storage_type,
+    "Tags": tags,
+    "VpcSecurityGroupIds": vpc_security_group_ids
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DBClusterIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rds/db_clusters_list_only/index.md b/website/docs/services/rds/db_clusters_list_only/index.md
deleted file mode 100644
index a1d2b1f60..000000000
--- a/website/docs/services/rds/db_clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: db_clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - db_clusters_list_only
-  - rds
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>db_clusters</code> in a region or regions, for all properties use <a href="/services/rds/db_clusters/"><code>db_clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>db_clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::RDS::DBCluster&#96;&#96; resource creates an Amazon Aurora DB cluster or Multi-AZ DB cluster.<br />For more information about creating an Aurora DB cluster, see &#91;Creating an Amazon Aurora DB cluster&#93;(https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/Aurora.CreateInstance.html) in the &#42;Amazon Aurora User Guide&#42;.<br />For more information about creating a Multi-AZ DB cluster, see &#91;Creating a Multi-AZ DB cluster&#93;(https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/create-multi-az-db-cluster.html) in the &#42;Amazon RDS User Guide&#42;.<br />You can only create this resource in AWS Regions where Amazon Aurora or Multi-AZ DB clusters are supported.<br />&#42;Updating DB clusters&#42; <br />When properties labeled "&#42;Update requires:&#42;&#91;Replacement&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-replacement)" are updated, AWS CloudFormation first creates a replacement DB cluster, then changes references from other dependent resources to point to the replacement DB cluster, and finally deletes the old DB cluster.<br />We highly recommend that you take a snapshot of the database before updating the stack. If you don't, you lose the data when AWS CloudFormation replaces your DB cluster. To preserve your data, perform the following procedure:<br />1. Deactivate any applications that are using the DB cluster so that there's no activity on the DB instance.<br />1. Create a snapshot of the DB cluster. For more information, see &#91;Creating a DB cluster snapshot&#93;(https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER&#95;CreateSnapshotCluster.html).<br />1. If you want to restore your DB cluster using a DB cluster snapshot, modify the updated template with your DB cluster changes and add the &#96;&#96;SnapshotIdentifier&#96;&#96; property with the ID of the DB cluster snapshot that you want to use.<br />After you restore a DB cluster with a &#96;&#96;SnapshotIdentifier&#96;&#96; property, you must specify the same &#96;&#96;SnapshotIdentifier&#96;&#96; property for any future updates to the DB cluster. When you specify this property for an update, the DB cluster is not restored from the DB cluster snapshot again, and the data in the database is not changed. However, if you don't specify the &#96;&#96;SnapshotIdentifier&#96;&#96; property, an empty DB cluster is created, and the original DB cluster is deleted. If you specify a property that is different from the previous snapshot restore property, a new DB cluster is restored from the specified &#96;&#96;SnapshotIdentifier&#96;&#96; property, and the original DB cluster is deleted.<br />1. Update the stack.<br /><br />Currently, when you are updating the stack for an Aurora Serverless DB cluster, you can't include changes to any other properties when you specify one of the following properties: &#96;&#96;PreferredBackupWindow&#96;&#96;, &#96;&#96;PreferredMaintenanceWindow&#96;&#96;, and &#96;&#96;Port&#96;&#96;. This limitation doesn't apply to provisioned DB clusters.<br />For more information about updating other properties of this resource, see &#96;&#96;ModifyDBCluster&#96;&#96;. For more information about updating stacks, see &#91;CloudFormation Stacks Updates&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks.html).<br />&#42;Deleting DB clusters&#42; <br />The default &#96;&#96;DeletionPolicy&#96;&#96; for &#96;&#96;AWS::RDS::DBCluster&#96;&#96; resources is &#96;&#96;Snapshot&#96;&#96;. For more information about how AWS CloudFormation deletes resources, see &#91;DeletionPolicy Attribute&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html).</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rds.db_clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "db_cluster_identifier",
-    "type": "string",
-    "description": "The DB cluster identifier. This parameter is stored as a lowercase string.<br />Constraints:<br />+ Must contain from 1 to 63 letters, numbers, or hyphens.<br />+ First character must be a letter.<br />+ Can't end with a hyphen or contain two consecutive hyphens.<br /><br />Example: &#96;&#96;my-cluster1&#96;&#96;<br />Valid for: Aurora DB clusters and Multi-AZ DB clusters"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>db_clusters</code> in a region.
-```sql
-SELECT
-region,
-db_cluster_identifier
-FROM awscc.rds.db_clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>db_clusters_list_only</code> resource, see <a href="/services/rds/db_clusters/#permissions"><code>db_clusters</code></a>
-
diff --git a/website/docs/services/rds/db_instances/index.md b/website/docs/services/rds/db_instances/index.md
index 7e57c868d..7e3fd8bfe 100644
--- a/website/docs/services/rds/db_instances/index.md
+++ b/website/docs/services/rds/db_instances/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>db_instance</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "allocated_storage",
@@ -619,6 +628,23 @@ Creates, updates, deletes or gets a <code>db_instance</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "db_instance_identifier",
+    "type": "string",
+    "description": "A name for the DB instance. If you specify a name, AWS CloudFormation converts it to lowercase. If you don't specify a name, AWS CloudFormation generates a unique physical ID and uses that ID for the DB instance. For more information, see &#91;Name Type&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-name.html).<br />For information about constraints that apply to DB instance identifiers, see &#91;Naming constraints in Amazon RDS&#93;(https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP&#95;Limits.html#RDS&#95;Limits.Constraints) in the &#42;Amazon RDS User Guide&#42;.<br />If you specify a name, you can't perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html"><code>AWS::RDS::DBInstance</code></a>.
 
@@ -628,31 +654,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>db_instances</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>db_instances</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>db_instances</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>db_instances_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>db_instances</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -661,6 +693,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>db_instance</code>.
 ```sql
 SELECT
@@ -765,6 +806,19 @@ apply_immediately
 FROM awscc.rds.db_instances
 WHERE region = 'us-east-1' AND data__Identifier = '<DBInstanceIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>db_instances</code> in a region.
+```sql
+SELECT
+region,
+db_instance_identifier
+FROM awscc.rds.db_instances_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1317,6 +1371,84 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rds.db_instances
+SET data__PatchDocument = string('{{ {
+    "AllocatedStorage": allocated_storage,
+    "AllowMajorVersionUpgrade": allow_major_version_upgrade,
+    "AssociatedRoles": associated_roles,
+    "AutoMinorVersionUpgrade": auto_minor_version_upgrade,
+    "AutomaticBackupReplicationRegion": automatic_backup_replication_region,
+    "AutomaticBackupReplicationKmsKeyId": automatic_backup_replication_kms_key_id,
+    "AutomaticBackupReplicationRetentionPeriod": automatic_backup_replication_retention_period,
+    "AvailabilityZone": availability_zone,
+    "BackupRetentionPeriod": backup_retention_period,
+    "CACertificateIdentifier": ca_certificate_identifier,
+    "CertificateRotationRestart": certificate_rotation_restart,
+    "CopyTagsToSnapshot": copy_tags_to_snapshot,
+    "DatabaseInsightsMode": database_insights_mode,
+    "DBClusterSnapshotIdentifier": db_cluster_snapshot_identifier,
+    "DBInstanceClass": db_instance_class,
+    "DBParameterGroupName": db_parameter_group_name,
+    "DBSecurityGroups": db_security_groups,
+    "DBSnapshotIdentifier": db_snapshot_identifier,
+    "DedicatedLogVolume": dedicated_log_volume,
+    "DeleteAutomatedBackups": delete_automated_backups,
+    "DeletionProtection": deletion_protection,
+    "Domain": domain,
+    "DomainAuthSecretArn": domain_auth_secret_arn,
+    "DomainDnsIps": domain_dns_ips,
+    "DomainFqdn": domain_fqdn,
+    "DomainIAMRoleName": domain_iam_role_name,
+    "DomainOu": domain_ou,
+    "EnableCloudwatchLogsExports": enable_cloudwatch_logs_exports,
+    "EnableIAMDatabaseAuthentication": enable_iam_database_authentication,
+    "EnablePerformanceInsights": enable_performance_insights,
+    "Engine": engine,
+    "EngineLifecycleSupport": engine_lifecycle_support,
+    "EngineVersion": engine_version,
+    "ManageMasterUserPassword": manage_master_user_password,
+    "Iops": iops,
+    "LicenseModel": license_model,
+    "MasterUserPassword": master_user_password,
+    "MaxAllocatedStorage": max_allocated_storage,
+    "MonitoringInterval": monitoring_interval,
+    "MonitoringRoleArn": monitoring_role_arn,
+    "MultiAZ": multi_az,
+    "NetworkType": network_type,
+    "OptionGroupName": option_group_name,
+    "PerformanceInsightsKMSKeyId": performance_insights_kms_key_id,
+    "PerformanceInsightsRetentionPeriod": performance_insights_retention_period,
+    "Port": port,
+    "PreferredBackupWindow": preferred_backup_window,
+    "PreferredMaintenanceWindow": preferred_maintenance_window,
+    "ProcessorFeatures": processor_features,
+    "PromotionTier": promotion_tier,
+    "PubliclyAccessible": publicly_accessible,
+    "ReplicaMode": replica_mode,
+    "RestoreTime": restore_time,
+    "SourceDBClusterIdentifier": source_db_cluster_identifier,
+    "SourceDbiResourceId": source_dbi_resource_id,
+    "SourceDBInstanceAutomatedBackupsArn": source_db_instance_automated_backups_arn,
+    "SourceDBInstanceIdentifier": source_db_instance_identifier,
+    "StorageType": storage_type,
+    "StorageThroughput": storage_throughput,
+    "Tags": tags,
+    "TdeCredentialArn": tde_credential_arn,
+    "TdeCredentialPassword": tde_credential_password,
+    "UseDefaultProcessorFeatures": use_default_processor_features,
+    "UseLatestRestorableTime": use_latest_restorable_time,
+    "VPCSecurityGroups": vpc_security_groups,
+    "ApplyImmediately": apply_immediately
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DBInstanceIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rds/db_instances_list_only/index.md b/website/docs/services/rds/db_instances_list_only/index.md
deleted file mode 100644
index 252d4dfd1..000000000
--- a/website/docs/services/rds/db_instances_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: db_instances_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - db_instances_list_only
-  - rds
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>db_instances</code> in a region or regions, for all properties use <a href="/services/rds/db_instances/"><code>db_instances</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>db_instances_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::RDS::DBInstance&#96;&#96; resource creates an Amazon DB instance. The new DB instance can be an RDS DB instance, or it can be a DB instance in an Aurora DB cluster.<br />For more information about creating an RDS DB instance, see &#91;Creating an Amazon RDS DB instance&#93;(https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER&#95;CreateDBInstance.html) in the &#42;Amazon RDS User Guide&#42;.<br />For more information about creating a DB instance in an Aurora DB cluster, see &#91;Creating an Amazon Aurora DB cluster&#93;(https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/Aurora.CreateInstance.html) in the &#42;Amazon Aurora User Guide&#42;.<br />If you import an existing DB instance, and the template configuration doesn't match the actual configuration of the DB instance, AWS CloudFormation applies the changes in the template during the import operation.<br />If a DB instance is deleted or replaced during an update, AWS CloudFormation deletes all automated snapshots. However, it retains manual DB snapshots. During an update that requires replacement, you can apply a stack policy to prevent DB instances from being replaced. For more information, see &#91;Prevent Updates to Stack Resources&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/protect-stack-resources.html).<br />&#42;Updating DB instances&#42; <br />When properties labeled "&#42;Update requires:&#42;&#91;Replacement&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-replacement)" are updated, AWS CloudFormation first creates a replacement DB instance, then changes references from other dependent resources to point to the replacement DB instance, and finally deletes the old DB instance.<br />We highly recommend that you take a snapshot of the database before updating the stack. If you don't, you lose the data when AWS CloudFormation replaces your DB instance. To preserve your data, perform the following procedure:<br />1. Deactivate any applications that are using the DB instance so that there's no activity on the DB instance.<br />1. Create a snapshot of the DB instance. For more information, see &#91;Creating a DB Snapshot&#93;(https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER&#95;CreateSnapshot.html).<br />1. If you want to restore your instance using a DB snapshot, modify the updated template with your DB instance changes and add the &#96;&#96;DBSnapshotIdentifier&#96;&#96; property with the ID of the DB snapshot that you want to use.<br />After you restore a DB instance with a &#96;&#96;DBSnapshotIdentifier&#96;&#96; property, you can delete the &#96;&#96;DBSnapshotIdentifier&#96;&#96; property. When you specify this property for an update, the DB instance is not restored from the DB snapshot again, and the data in the database is not changed. However, if you don't specify the &#96;&#96;DBSnapshotIdentifier&#96;&#96; property, an empty DB instance is created, and the original DB instance is deleted. If you specify a property that is different from the previous snapshot restore property, a new DB instance is restored from the specified &#96;&#96;DBSnapshotIdentifier&#96;&#96; property, and the original DB instance is deleted.<br />1. Update the stack.<br /><br />For more information about updating other properties of this resource, see &#96;&#96;ModifyDBInstance&#96;&#96;. For more information about updating stacks, see &#91;CloudFormation Stacks Updates&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks.html).<br />&#42;Deleting DB instances&#42; <br />For DB instances that are part of an Aurora DB cluster, you can set a deletion policy for your DB instance to control how AWS CloudFormation handles the DB instance when the stack is deleted. For Amazon RDS DB instances, you can choose to &#42;retain&#42; the DB instance, to &#42;delete&#42; the DB instance, or to &#42;create a snapshot&#42; of the DB instance. The default AWS CloudFormation behavior depends on the &#96;&#96;DBClusterIdentifier&#96;&#96; property:<br />1. For &#96;&#96;AWS::RDS::DBInstance&#96;&#96; resources that don't specify the &#96;&#96;DBClusterIdentifier&#96;&#96; property, AWS CloudFormation saves a snapshot of the DB instance.<br />1. For &#96;&#96;AWS::RDS::DBInstance&#96;&#96; resources that do specify the &#96;&#96;DBClusterIdentifier&#96;&#96; property, AWS CloudFormation deletes the DB instance.<br /><br />For more information, see &#91;DeletionPolicy Attribute&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html).</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rds.db_instances_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "db_instance_identifier",
-    "type": "string",
-    "description": "A name for the DB instance. If you specify a name, AWS CloudFormation converts it to lowercase. If you don't specify a name, AWS CloudFormation generates a unique physical ID and uses that ID for the DB instance. For more information, see &#91;Name Type&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-name.html).<br />For information about constraints that apply to DB instance identifiers, see &#91;Naming constraints in Amazon RDS&#93;(https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP&#95;Limits.html#RDS&#95;Limits.Constraints) in the &#42;Amazon RDS User Guide&#42;.<br />If you specify a name, you can't perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you must replace the resource, specify a new name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>db_instances</code> in a region.
-```sql
-SELECT
-region,
-db_instance_identifier
-FROM awscc.rds.db_instances_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>db_instances_list_only</code> resource, see <a href="/services/rds/db_instances/#permissions"><code>db_instances</code></a>
-
diff --git a/website/docs/services/rds/db_parameter_groups/index.md b/website/docs/services/rds/db_parameter_groups/index.md
index 330db7aa7..f36955548 100644
--- a/website/docs/services/rds/db_parameter_groups/index.md
+++ b/website/docs/services/rds/db_parameter_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>db_parameter_group</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "db_parameter_group_name",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>db_parameter_group</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "db_parameter_group_name",
+    "type": "string",
+    "description": "The name of the DB parameter group.<br />Constraints:<br />+ Must be 1 to 255 letters, numbers, or hyphens.<br />+ First character must be a letter<br />+ Can't end with a hyphen or contain two consecutive hyphens<br /><br />If you don't specify a value for &#96;&#96;DBParameterGroupName&#96;&#96; property, a name is automatically created for the DB parameter group.<br />This value is stored as a lowercase string."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbparametergroup.html"><code>AWS::RDS::DBParameterGroup</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>db_parameter_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Family, Description, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>db_parameter_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>db_parameter_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>db_parameter_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>db_parameter_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>db_parameter_group</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.rds.db_parameter_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<DBParameterGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>db_parameter_groups</code> in a region.
+```sql
+SELECT
+region,
+db_parameter_group_name
+FROM awscc.rds.db_parameter_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -211,6 +265,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rds.db_parameter_groups
+SET data__PatchDocument = string('{{ {
+    "Parameters": parameters,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DBParameterGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rds/db_parameter_groups_list_only/index.md b/website/docs/services/rds/db_parameter_groups_list_only/index.md
deleted file mode 100644
index 4b07d6f55..000000000
--- a/website/docs/services/rds/db_parameter_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: db_parameter_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - db_parameter_groups_list_only
-  - rds
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>db_parameter_groups</code> in a region or regions, for all properties use <a href="/services/rds/db_parameter_groups/"><code>db_parameter_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>db_parameter_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::RDS::DBParameterGroup&#96;&#96; resource creates a custom parameter group for an RDS database family.<br />This type can be declared in a template and referenced in the &#96;&#96;DBParameterGroupName&#96;&#96; property of an &#96;&#96;AWS::RDS::DBInstance&#96;&#96; resource.<br />For information about configuring parameters for Amazon RDS DB instances, see &#91;Working with parameter groups&#93;(https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER&#95;WorkingWithParamGroups.html) in the &#42;Amazon RDS User Guide&#42;.<br />For information about configuring parameters for Amazon Aurora DB instances, see &#91;Working with parameter groups&#93;(https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER&#95;WorkingWithParamGroups.html) in the &#42;Amazon Aurora User Guide&#42;.<br />Applying a parameter group to a DB instance may require the DB instance to reboot, resulting in a database outage for the duration of the reboot.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rds.db_parameter_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "db_parameter_group_name",
-    "type": "string",
-    "description": "The name of the DB parameter group.<br />Constraints:<br />+ Must be 1 to 255 letters, numbers, or hyphens.<br />+ First character must be a letter<br />+ Can't end with a hyphen or contain two consecutive hyphens<br /><br />If you don't specify a value for &#96;&#96;DBParameterGroupName&#96;&#96; property, a name is automatically created for the DB parameter group.<br />This value is stored as a lowercase string."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>db_parameter_groups</code> in a region.
-```sql
-SELECT
-region,
-db_parameter_group_name
-FROM awscc.rds.db_parameter_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>db_parameter_groups_list_only</code> resource, see <a href="/services/rds/db_parameter_groups/#permissions"><code>db_parameter_groups</code></a>
-
diff --git a/website/docs/services/rds/db_proxies/index.md b/website/docs/services/rds/db_proxies/index.md
index 5ab3edd72..1390b6ff4 100644
--- a/website/docs/services/rds/db_proxies/index.md
+++ b/website/docs/services/rds/db_proxies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>db_proxy</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "auth",
@@ -144,6 +153,23 @@ Creates, updates, deletes or gets a <code>db_proxy</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "db_proxy_name",
+    "type": "string",
+    "description": "The identifier for the proxy. This name must be unique for all proxies owned by your AWS account in the specified AWS Region."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html"><code>AWS::RDS::DBProxy</code></a>.
 
@@ -153,31 +179,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>db_proxies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Auth, DBProxyName, EngineFamily, RoleArn, VpcSubnetIds, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>db_proxies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>db_proxies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>db_proxies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>db_proxies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -186,6 +218,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>db_proxy</code>.
 ```sql
 SELECT
@@ -206,6 +247,19 @@ vpc_subnet_ids
 FROM awscc.rds.db_proxies
 WHERE region = 'us-east-1' AND data__Identifier = '<DBProxyName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>db_proxies</code> in a region.
+```sql
+SELECT
+region,
+db_proxy_name
+FROM awscc.rds.db_proxies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -319,6 +373,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rds.db_proxies
+SET data__PatchDocument = string('{{ {
+    "Auth": auth,
+    "DebugLogging": debug_logging,
+    "IdleClientTimeout": idle_client_timeout,
+    "RequireTLS": require_tls,
+    "RoleArn": role_arn,
+    "Tags": tags,
+    "VpcSecurityGroupIds": vpc_security_group_ids
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DBProxyName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rds/db_proxies_list_only/index.md b/website/docs/services/rds/db_proxies_list_only/index.md
deleted file mode 100644
index 918bd8757..000000000
--- a/website/docs/services/rds/db_proxies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: db_proxies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - db_proxies_list_only
-  - rds
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>db_proxies</code> in a region or regions, for all properties use <a href="/services/rds/db_proxies/"><code>db_proxies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>db_proxies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::RDS::DBProxy</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rds.db_proxies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "db_proxy_name",
-    "type": "string",
-    "description": "The identifier for the proxy. This name must be unique for all proxies owned by your AWS account in the specified AWS Region."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>db_proxies</code> in a region.
-```sql
-SELECT
-region,
-db_proxy_name
-FROM awscc.rds.db_proxies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>db_proxies_list_only</code> resource, see <a href="/services/rds/db_proxies/#permissions"><code>db_proxies</code></a>
-
diff --git a/website/docs/services/rds/db_proxy_endpoints/index.md b/website/docs/services/rds/db_proxy_endpoints/index.md
index 190874c32..c7f3919d1 100644
--- a/website/docs/services/rds/db_proxy_endpoints/index.md
+++ b/website/docs/services/rds/db_proxy_endpoints/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>db_proxy_endpoint</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "db_proxy_endpoint_name",
@@ -102,6 +111,28 @@ Creates, updates, deletes or gets a <code>db_proxy_endpoint</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "db_proxy_endpoint_name",
+    "type": "string",
+    "description": "The identifier for the DB proxy endpoint. This name must be unique for all DB proxy endpoints owned by your AWS account in the specified AWS Region."
+  },
+  {
+    "name": "endpoint",
+    "type": "string",
+    "description": "The endpoint that you can use to connect to the DB proxy. You include the endpoint value in the connection string for a database client application."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxyendpoint.html"><code>AWS::RDS::DBProxyEndpoint</code></a>.
 
@@ -111,31 +142,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>db_proxy_endpoints</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DBProxyName, DBProxyEndpointName, VpcSubnetIds, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>db_proxy_endpoints</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>db_proxy_endpoints</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>db_proxy_endpoints_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>db_proxy_endpoints</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +181,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>db_proxy_endpoint</code>.
 ```sql
 SELECT
@@ -161,6 +207,19 @@ tags
 FROM awscc.rds.db_proxy_endpoints
 WHERE region = 'us-east-1' AND data__Identifier = '<DBProxyEndpointName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>db_proxy_endpoints</code> in a region.
+```sql
+SELECT
+region,
+db_proxy_endpoint_name
+FROM awscc.rds.db_proxy_endpoints_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -249,6 +308,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rds.db_proxy_endpoints
+SET data__PatchDocument = string('{{ {
+    "VpcSecurityGroupIds": vpc_security_group_ids,
+    "TargetRole": target_role,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DBProxyEndpointName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rds/db_proxy_endpoints_list_only/index.md b/website/docs/services/rds/db_proxy_endpoints_list_only/index.md
deleted file mode 100644
index 5df2e3971..000000000
--- a/website/docs/services/rds/db_proxy_endpoints_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: db_proxy_endpoints_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - db_proxy_endpoints_list_only
-  - rds
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>db_proxy_endpoints</code> in a region or regions, for all properties use <a href="/services/rds/db_proxy_endpoints/"><code>db_proxy_endpoints</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>db_proxy_endpoints_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::RDS::DBProxyEndpoint.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rds.db_proxy_endpoints_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "db_proxy_endpoint_name",
-    "type": "string",
-    "description": "The identifier for the DB proxy endpoint. This name must be unique for all DB proxy endpoints owned by your AWS account in the specified AWS Region."
-  },
-  {
-    "name": "endpoint",
-    "type": "string",
-    "description": "The endpoint that you can use to connect to the DB proxy. You include the endpoint value in the connection string for a database client application."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>db_proxy_endpoints</code> in a region.
-```sql
-SELECT
-region,
-db_proxy_endpoint_name
-FROM awscc.rds.db_proxy_endpoints_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>db_proxy_endpoints_list_only</code> resource, see <a href="/services/rds/db_proxy_endpoints/#permissions"><code>db_proxy_endpoints</code></a>
-
diff --git a/website/docs/services/rds/db_proxy_target_groups/index.md b/website/docs/services/rds/db_proxy_target_groups/index.md
index 7da81435e..3b3a561fd 100644
--- a/website/docs/services/rds/db_proxy_target_groups/index.md
+++ b/website/docs/services/rds/db_proxy_target_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>db_proxy_target_group</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "db_proxy_name",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>db_proxy_target_group</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "target_group_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) representing the target group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxytargetgroup.html"><code>AWS::RDS::DBProxyTargetGroup</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>db_proxy_target_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DBProxyName, TargetGroupName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>db_proxy_target_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>db_proxy_target_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>db_proxy_target_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>db_proxy_target_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>db_proxy_target_group</code>.
 ```sql
 SELECT
@@ -152,6 +193,19 @@ db_cluster_identifiers
 FROM awscc.rds.db_proxy_target_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<TargetGroupArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>db_proxy_target_groups</code> in a region.
+```sql
+SELECT
+region,
+target_group_arn
+FROM awscc.rds.db_proxy_target_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -238,6 +292,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rds.db_proxy_target_groups
+SET data__PatchDocument = string('{{ {
+    "ConnectionPoolConfigurationInfo": connection_pool_configuration_info,
+    "DBInstanceIdentifiers": db_instance_identifiers,
+    "DBClusterIdentifiers": db_cluster_identifiers
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TargetGroupArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rds/db_proxy_target_groups_list_only/index.md b/website/docs/services/rds/db_proxy_target_groups_list_only/index.md
deleted file mode 100644
index 31bef1f6f..000000000
--- a/website/docs/services/rds/db_proxy_target_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: db_proxy_target_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - db_proxy_target_groups_list_only
-  - rds
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>db_proxy_target_groups</code> in a region or regions, for all properties use <a href="/services/rds/db_proxy_target_groups/"><code>db_proxy_target_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>db_proxy_target_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::RDS::DBProxyTargetGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rds.db_proxy_target_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "target_group_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) representing the target group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>db_proxy_target_groups</code> in a region.
-```sql
-SELECT
-region,
-target_group_arn
-FROM awscc.rds.db_proxy_target_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>db_proxy_target_groups_list_only</code> resource, see <a href="/services/rds/db_proxy_target_groups/#permissions"><code>db_proxy_target_groups</code></a>
-
diff --git a/website/docs/services/rds/db_shard_groups/index.md b/website/docs/services/rds/db_shard_groups/index.md
index 1918b06c5..bbea6f304 100644
--- a/website/docs/services/rds/db_shard_groups/index.md
+++ b/website/docs/services/rds/db_shard_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>db_shard_group</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "db_shard_group_resource_id",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>db_shard_group</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "db_shard_group_identifier",
+    "type": "string",
+    "description": "The name of the DB shard group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbshardgroup.html"><code>AWS::RDS::DBShardGroup</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>db_shard_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DBClusterIdentifier, MaxACU, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>db_shard_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>db_shard_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>db_shard_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>db_shard_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>db_shard_group</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ tags
 FROM awscc.rds.db_shard_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<DBShardGroupIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>db_shard_groups</code> in a region.
+```sql
+SELECT
+region,
+db_shard_group_identifier
+FROM awscc.rds.db_shard_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -243,6 +297,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rds.db_shard_groups
+SET data__PatchDocument = string('{{ {
+    "ComputeRedundancy": compute_redundancy,
+    "MaxACU": max_ac_u,
+    "MinACU": min_ac_u,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DBShardGroupIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rds/db_shard_groups_list_only/index.md b/website/docs/services/rds/db_shard_groups_list_only/index.md
deleted file mode 100644
index a83742548..000000000
--- a/website/docs/services/rds/db_shard_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: db_shard_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - db_shard_groups_list_only
-  - rds
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>db_shard_groups</code> in a region or regions, for all properties use <a href="/services/rds/db_shard_groups/"><code>db_shard_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>db_shard_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a new DB shard group for Aurora Limitless Database. You must enable Aurora Limitless Database to create a DB shard group.<br />Valid for: Aurora DB clusters only</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rds.db_shard_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "db_shard_group_identifier",
-    "type": "string",
-    "description": "The name of the DB shard group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>db_shard_groups</code> in a region.
-```sql
-SELECT
-region,
-db_shard_group_identifier
-FROM awscc.rds.db_shard_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>db_shard_groups_list_only</code> resource, see <a href="/services/rds/db_shard_groups/#permissions"><code>db_shard_groups</code></a>
-
diff --git a/website/docs/services/rds/db_subnet_groups/index.md b/website/docs/services/rds/db_subnet_groups/index.md
index 9b1d81ab0..64dd7dbf6 100644
--- a/website/docs/services/rds/db_subnet_groups/index.md
+++ b/website/docs/services/rds/db_subnet_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>db_subnet_group</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "db_subnet_group_description",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>db_subnet_group</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "db_subnet_group_name",
+    "type": "string",
+    "description": "The name for the DB subnet group. This value is stored as a lowercase string.<br />Constraints:<br />+ Must contain no more than 255 letters, numbers, periods, underscores, spaces, or hyphens.<br />+ Must not be default.<br />+ First character must be a letter.<br /><br />Example: &#96;&#96;mydbsubnetgroup&#96;&#96;"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbsubnetgroup.html"><code>AWS::RDS::DBSubnetGroup</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>db_subnet_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DBSubnetGroupDescription, SubnetIds, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>db_subnet_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>db_subnet_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>db_subnet_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>db_subnet_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>db_subnet_group</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ tags
 FROM awscc.rds.db_subnet_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<DBSubnetGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>db_subnet_groups</code> in a region.
+```sql
+SELECT
+region,
+db_subnet_group_name
+FROM awscc.rds.db_subnet_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -202,6 +256,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rds.db_subnet_groups
+SET data__PatchDocument = string('{{ {
+    "DBSubnetGroupDescription": db_subnet_group_description,
+    "SubnetIds": subnet_ids,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DBSubnetGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rds/db_subnet_groups_list_only/index.md b/website/docs/services/rds/db_subnet_groups_list_only/index.md
deleted file mode 100644
index 778201876..000000000
--- a/website/docs/services/rds/db_subnet_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: db_subnet_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - db_subnet_groups_list_only
-  - rds
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>db_subnet_groups</code> in a region or regions, for all properties use <a href="/services/rds/db_subnet_groups/"><code>db_subnet_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>db_subnet_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::RDS::DBSubnetGroup&#96;&#96; resource creates a database subnet group. Subnet groups must contain at least two subnets in two different Availability Zones in the same region. <br />For more information, see &#91;Working with DB subnet groups&#93;(https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER&#95;VPC.WorkingWithRDSInstanceinaVPC.html#USER&#95;VPC.Subnets) in the &#42;Amazon RDS User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rds.db_subnet_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "db_subnet_group_name",
-    "type": "string",
-    "description": "The name for the DB subnet group. This value is stored as a lowercase string.<br />Constraints:<br />+ Must contain no more than 255 letters, numbers, periods, underscores, spaces, or hyphens.<br />+ Must not be default.<br />+ First character must be a letter.<br /><br />Example: &#96;&#96;mydbsubnetgroup&#96;&#96;"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>db_subnet_groups</code> in a region.
-```sql
-SELECT
-region,
-db_subnet_group_name
-FROM awscc.rds.db_subnet_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>db_subnet_groups_list_only</code> resource, see <a href="/services/rds/db_subnet_groups/#permissions"><code>db_subnet_groups</code></a>
-
diff --git a/website/docs/services/rds/event_subscriptions/index.md b/website/docs/services/rds/event_subscriptions/index.md
index 87d977d59..e25a535c4 100644
--- a/website/docs/services/rds/event_subscriptions/index.md
+++ b/website/docs/services/rds/event_subscriptions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>event_subscription</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "tags",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets an <code>event_subscription</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "subscription_name",
+    "type": "string",
+    "description": "The name of the subscription.<br />Constraints: The name must be less than 255 characters."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html"><code>AWS::RDS::EventSubscription</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>event_subscriptions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SnsTopicArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>event_subscriptions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>event_subscriptions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>event_subscriptions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>event_subscriptions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>event_subscription</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ source_type
 FROM awscc.rds.event_subscriptions
 WHERE region = 'us-east-1' AND data__Identifier = '<SubscriptionName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>event_subscriptions</code> in a region.
+```sql
+SELECT
+region,
+subscription_name
+FROM awscc.rds.event_subscriptions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -231,6 +285,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rds.event_subscriptions
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Enabled": enabled,
+    "EventCategories": event_categories,
+    "SourceIds": source_ids,
+    "SourceType": source_type
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SubscriptionName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rds/event_subscriptions_list_only/index.md b/website/docs/services/rds/event_subscriptions_list_only/index.md
deleted file mode 100644
index f1414cf74..000000000
--- a/website/docs/services/rds/event_subscriptions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: event_subscriptions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - event_subscriptions_list_only
-  - rds
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>event_subscriptions</code> in a region or regions, for all properties use <a href="/services/rds/event_subscriptions/"><code>event_subscriptions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>event_subscriptions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::RDS::EventSubscription&#96;&#96; resource allows you to receive notifications for Amazon Relational Database Service events through the Amazon Simple Notification Service (Amazon SNS). For more information, see &#91;Using Amazon RDS Event Notification&#93;(https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER&#95;Events.html) in the &#42;Amazon RDS User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rds.event_subscriptions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "subscription_name",
-    "type": "string",
-    "description": "The name of the subscription.<br />Constraints: The name must be less than 255 characters."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>event_subscriptions</code> in a region.
-```sql
-SELECT
-region,
-subscription_name
-FROM awscc.rds.event_subscriptions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>event_subscriptions_list_only</code> resource, see <a href="/services/rds/event_subscriptions/#permissions"><code>event_subscriptions</code></a>
-
diff --git a/website/docs/services/rds/global_clusters/index.md b/website/docs/services/rds/global_clusters/index.md
index fea9bf0ab..48ca488a5 100644
--- a/website/docs/services/rds/global_clusters/index.md
+++ b/website/docs/services/rds/global_clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>global_cluster</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "engine",
@@ -104,6 +113,23 @@ Creates, updates, deletes or gets a <code>global_cluster</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "global_cluster_identifier",
+    "type": "string",
+    "description": "The cluster identifier of the new global database cluster. This parameter is stored as a lowercase string."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-globalcluster.html"><code>AWS::RDS::GlobalCluster</code></a>.
 
@@ -113,31 +139,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>global_clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>global_clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>global_clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>global_clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>global_clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -146,6 +178,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>global_cluster</code>.
 ```sql
 SELECT
@@ -162,6 +203,19 @@ global_endpoint
 FROM awscc.rds.global_clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<GlobalClusterIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>global_clusters</code> in a region.
+```sql
+SELECT
+region,
+global_cluster_identifier
+FROM awscc.rds.global_clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -266,6 +320,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rds.global_clusters
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "EngineLifecycleSupport": engine_lifecycle_support,
+    "EngineVersion": engine_version,
+    "DeletionProtection": deletion_protection
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<GlobalClusterIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rds/global_clusters_list_only/index.md b/website/docs/services/rds/global_clusters_list_only/index.md
deleted file mode 100644
index e787d81ca..000000000
--- a/website/docs/services/rds/global_clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: global_clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - global_clusters_list_only
-  - rds
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>global_clusters</code> in a region or regions, for all properties use <a href="/services/rds/global_clusters/"><code>global_clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>global_clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::RDS::GlobalCluster</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rds.global_clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "global_cluster_identifier",
-    "type": "string",
-    "description": "The cluster identifier of the new global database cluster. This parameter is stored as a lowercase string."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>global_clusters</code> in a region.
-```sql
-SELECT
-region,
-global_cluster_identifier
-FROM awscc.rds.global_clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>global_clusters_list_only</code> resource, see <a href="/services/rds/global_clusters/#permissions"><code>global_clusters</code></a>
-
diff --git a/website/docs/services/rds/index.md b/website/docs/services/rds/index.md
index a6eafc368..64a8949e9 100644
--- a/website/docs/services/rds/index.md
+++ b/website/docs/services/rds/index.md
@@ -20,7 +20,7 @@ The rds service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>28</b></span><br />
+<span>total resources:&nbsp;<b>14</b></span><br />
 </div>
 </div>
 
@@ -30,34 +30,20 @@ The rds service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/rds/customdb_engine_versions/">customdb_engine_versions</a><br />
-<a href="/services/rds/customdb_engine_versions_list_only/">customdb_engine_versions_list_only</a><br />
 <a href="/services/rds/db_cluster_parameter_groups/">db_cluster_parameter_groups</a><br />
-<a href="/services/rds/db_cluster_parameter_groups_list_only/">db_cluster_parameter_groups_list_only</a><br />
 <a href="/services/rds/db_clusters/">db_clusters</a><br />
-<a href="/services/rds/db_clusters_list_only/">db_clusters_list_only</a><br />
 <a href="/services/rds/db_instances/">db_instances</a><br />
-<a href="/services/rds/db_instances_list_only/">db_instances_list_only</a><br />
 <a href="/services/rds/db_parameter_groups/">db_parameter_groups</a><br />
-<a href="/services/rds/db_parameter_groups_list_only/">db_parameter_groups_list_only</a><br />
 <a href="/services/rds/db_proxies/">db_proxies</a><br />
-<a href="/services/rds/db_proxies_list_only/">db_proxies_list_only</a><br />
-<a href="/services/rds/db_proxy_endpoints/">db_proxy_endpoints</a><br />
-<a href="/services/rds/db_proxy_endpoints_list_only/">db_proxy_endpoints_list_only</a>
+<a href="/services/rds/db_proxy_endpoints/">db_proxy_endpoints</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/rds/db_proxy_target_groups/">db_proxy_target_groups</a><br />
-<a href="/services/rds/db_proxy_target_groups_list_only/">db_proxy_target_groups_list_only</a><br />
 <a href="/services/rds/db_shard_groups/">db_shard_groups</a><br />
-<a href="/services/rds/db_shard_groups_list_only/">db_shard_groups_list_only</a><br />
 <a href="/services/rds/db_subnet_groups/">db_subnet_groups</a><br />
-<a href="/services/rds/db_subnet_groups_list_only/">db_subnet_groups_list_only</a><br />
 <a href="/services/rds/event_subscriptions/">event_subscriptions</a><br />
-<a href="/services/rds/event_subscriptions_list_only/">event_subscriptions_list_only</a><br />
 <a href="/services/rds/global_clusters/">global_clusters</a><br />
-<a href="/services/rds/global_clusters_list_only/">global_clusters_list_only</a><br />
 <a href="/services/rds/integrations/">integrations</a><br />
-<a href="/services/rds/integrations_list_only/">integrations_list_only</a><br />
-<a href="/services/rds/option_groups/">option_groups</a><br />
-<a href="/services/rds/option_groups_list_only/">option_groups_list_only</a>
+<a href="/services/rds/option_groups/">option_groups</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/rds/integrations/index.md b/website/docs/services/rds/integrations/index.md
index 9223691d0..ef2e2fff7 100644
--- a/website/docs/services/rds/integrations/index.md
+++ b/website/docs/services/rds/integrations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>integration</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "integration_name",
@@ -102,6 +111,23 @@ Creates, updates, deletes or gets an <code>integration</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "integration_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-integration.html"><code>AWS::RDS::Integration</code></a>.
 
@@ -111,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SourceArn, TargetArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>integrations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>integration</code>.
 ```sql
 SELECT
@@ -161,6 +202,19 @@ create_time
 FROM awscc.rds.integrations
 WHERE region = 'us-east-1' AND data__Identifier = '<IntegrationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>integrations</code> in a region.
+```sql
+SELECT
+region,
+integration_arn
+FROM awscc.rds.integrations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -253,6 +307,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rds.integrations
+SET data__PatchDocument = string('{{ {
+    "IntegrationName": integration_name,
+    "Description": description,
+    "Tags": tags,
+    "DataFilter": data_filter
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IntegrationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rds/integrations_list_only/index.md b/website/docs/services/rds/integrations_list_only/index.md
deleted file mode 100644
index 09ae38db3..000000000
--- a/website/docs/services/rds/integrations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: integrations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - integrations_list_only
-  - rds
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>integrations</code> in a region or regions, for all properties use <a href="/services/rds/integrations/"><code>integrations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>integrations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A zero-ETL integration with Amazon Redshift.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rds.integrations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "integration_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>integrations</code> in a region.
-```sql
-SELECT
-region,
-integration_arn
-FROM awscc.rds.integrations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>integrations_list_only</code> resource, see <a href="/services/rds/integrations/#permissions"><code>integrations</code></a>
-
diff --git a/website/docs/services/rds/option_groups/index.md b/website/docs/services/rds/option_groups/index.md
index f8e0f6d51..21e4b4df6 100644
--- a/website/docs/services/rds/option_groups/index.md
+++ b/website/docs/services/rds/option_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>option_group</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "option_group_name",
@@ -126,6 +135,23 @@ Creates, updates, deletes or gets an <code>option_group</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "option_group_name",
+    "type": "string",
+    "description": "The name of the option group to be created.<br />Constraints:<br />+ Must be 1 to 255 letters, numbers, or hyphens<br />+ First character must be a letter<br />+ Can't end with a hyphen or contain two consecutive hyphens<br /><br />Example: &#96;&#96;myoptiongroup&#96;&#96;<br />If you don't specify a value for &#96;&#96;OptionGroupName&#96;&#96; property, a name is automatically created for the option group.<br />This value is stored as a lowercase string."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-optiongroup.html"><code>AWS::RDS::OptionGroup</code></a>.
 
@@ -135,31 +161,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>option_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EngineName, MajorEngineVersion, OptionGroupDescription, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>option_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>option_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>option_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>option_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -168,6 +200,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>option_group</code>.
 ```sql
 SELECT
@@ -181,6 +222,19 @@ tags
 FROM awscc.rds.option_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<OptionGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>option_groups</code> in a region.
+```sql
+SELECT
+region,
+option_group_name
+FROM awscc.rds.option_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -277,6 +331,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rds.option_groups
+SET data__PatchDocument = string('{{ {
+    "OptionConfigurations": option_configurations,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<OptionGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rds/option_groups_list_only/index.md b/website/docs/services/rds/option_groups_list_only/index.md
deleted file mode 100644
index 1176470f4..000000000
--- a/website/docs/services/rds/option_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: option_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - option_groups_list_only
-  - rds
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>option_groups</code> in a region or regions, for all properties use <a href="/services/rds/option_groups/"><code>option_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>option_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::RDS::OptionGroup&#96;&#96; resource creates or updates an option group, to enable and configure features that are specific to a particular DB engine.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rds.option_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "option_group_name",
-    "type": "string",
-    "description": "The name of the option group to be created.<br />Constraints:<br />+ Must be 1 to 255 letters, numbers, or hyphens<br />+ First character must be a letter<br />+ Can't end with a hyphen or contain two consecutive hyphens<br /><br />Example: &#96;&#96;myoptiongroup&#96;&#96;<br />If you don't specify a value for &#96;&#96;OptionGroupName&#96;&#96; property, a name is automatically created for the option group.<br />This value is stored as a lowercase string."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>option_groups</code> in a region.
-```sql
-SELECT
-region,
-option_group_name
-FROM awscc.rds.option_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>option_groups_list_only</code> resource, see <a href="/services/rds/option_groups/#permissions"><code>option_groups</code></a>
-
diff --git a/website/docs/services/redshift/cluster_parameter_groups/index.md b/website/docs/services/redshift/cluster_parameter_groups/index.md
index 9f031de4c..1e8e55d9f 100644
--- a/website/docs/services/redshift/cluster_parameter_groups/index.md
+++ b/website/docs/services/redshift/cluster_parameter_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cluster_parameter_group</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "parameter_group_name",
@@ -89,6 +98,23 @@ Creates, updates, deletes or gets a <code>cluster_parameter_group</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "parameter_group_name",
+    "type": "string",
+    "description": "The name of the cluster parameter group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clusterparametergroup.html"><code>AWS::Redshift::ClusterParameterGroup</code></a>.
 
@@ -98,31 +124,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cluster_parameter_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Description, ParameterGroupFamily, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cluster_parameter_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cluster_parameter_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cluster_parameter_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cluster_parameter_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -131,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cluster_parameter_group</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.redshift.cluster_parameter_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<ParameterGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cluster_parameter_groups</code> in a region.
+```sql
+SELECT
+region,
+parameter_group_name
+FROM awscc.redshift.cluster_parameter_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -225,6 +279,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.redshift.cluster_parameter_groups
+SET data__PatchDocument = string('{{ {
+    "Parameters": parameters,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ParameterGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/redshift/cluster_parameter_groups_list_only/index.md b/website/docs/services/redshift/cluster_parameter_groups_list_only/index.md
deleted file mode 100644
index 30e896af4..000000000
--- a/website/docs/services/redshift/cluster_parameter_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: cluster_parameter_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cluster_parameter_groups_list_only
-  - redshift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cluster_parameter_groups</code> in a region or regions, for all properties use <a href="/services/redshift/cluster_parameter_groups/"><code>cluster_parameter_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cluster_parameter_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Redshift::ClusterParameterGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.redshift.cluster_parameter_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "parameter_group_name",
-    "type": "string",
-    "description": "The name of the cluster parameter group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cluster_parameter_groups</code> in a region.
-```sql
-SELECT
-region,
-parameter_group_name
-FROM awscc.redshift.cluster_parameter_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cluster_parameter_groups_list_only</code> resource, see <a href="/services/redshift/cluster_parameter_groups/#permissions"><code>cluster_parameter_groups</code></a>
-
diff --git a/website/docs/services/redshift/cluster_subnet_groups/index.md b/website/docs/services/redshift/cluster_subnet_groups/index.md
index 1f60862da..3145688f2 100644
--- a/website/docs/services/redshift/cluster_subnet_groups/index.md
+++ b/website/docs/services/redshift/cluster_subnet_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cluster_subnet_group</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>cluster_subnet_group</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_subnet_group_name",
+    "type": "string",
+    "description": "This name must be unique for all subnet groups that are created by your AWS account. If costumer do not provide it, cloudformation will generate it. Must not be \"Default\"."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersubnetgroup.html"><code>AWS::Redshift::ClusterSubnetGroup</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cluster_subnet_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Description, SubnetIds, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cluster_subnet_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cluster_subnet_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cluster_subnet_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cluster_subnet_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cluster_subnet_group</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ cluster_subnet_group_name
 FROM awscc.redshift.cluster_subnet_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<ClusterSubnetGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cluster_subnet_groups</code> in a region.
+```sql
+SELECT
+region,
+cluster_subnet_group_name
+FROM awscc.redshift.cluster_subnet_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -198,6 +252,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.redshift.cluster_subnet_groups
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "SubnetIds": subnet_ids,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ClusterSubnetGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/redshift/cluster_subnet_groups_list_only/index.md b/website/docs/services/redshift/cluster_subnet_groups_list_only/index.md
deleted file mode 100644
index f4849a92d..000000000
--- a/website/docs/services/redshift/cluster_subnet_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: cluster_subnet_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cluster_subnet_groups_list_only
-  - redshift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cluster_subnet_groups</code> in a region or regions, for all properties use <a href="/services/redshift/cluster_subnet_groups/"><code>cluster_subnet_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cluster_subnet_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Redshift::ClusterSubnetGroup. Specifies an Amazon Redshift subnet group.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.redshift.cluster_subnet_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cluster_subnet_group_name",
-    "type": "string",
-    "description": "This name must be unique for all subnet groups that are created by your AWS account. If costumer do not provide it, cloudformation will generate it. Must not be \"Default\"."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cluster_subnet_groups</code> in a region.
-```sql
-SELECT
-region,
-cluster_subnet_group_name
-FROM awscc.redshift.cluster_subnet_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cluster_subnet_groups_list_only</code> resource, see <a href="/services/redshift/cluster_subnet_groups/#permissions"><code>cluster_subnet_groups</code></a>
-
diff --git a/website/docs/services/redshift/clusters/index.md b/website/docs/services/redshift/clusters/index.md
index b4a00f8fc..af26d709f 100644
--- a/website/docs/services/redshift/clusters/index.md
+++ b/website/docs/services/redshift/clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "revision_target",
@@ -361,6 +370,23 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_identifier",
+    "type": "string",
+    "description": "A unique identifier for the cluster. You use this identifier to refer to the cluster for any subsequent cluster operations such as deleting or modifying. All alphabetical characters must be lower case, no hypens at the end, no two consecutive hyphens. Cluster name should be unique for all clusters within an AWS account"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html"><code>AWS::Redshift::Cluster</code></a>.
 
@@ -370,31 +396,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="NodeType, MasterUsername, DBName, ClusterType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -403,6 +435,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cluster</code>.
 ```sql
 SELECT
@@ -465,6 +506,19 @@ snapshot_copy_retention_period
 FROM awscc.redshift.clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<ClusterIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>clusters</code> in a region.
+```sql
+SELECT
+region,
+cluster_identifier
+FROM awscc.redshift.clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -747,6 +801,62 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.redshift.clusters
+SET data__PatchDocument = string('{{ {
+    "RevisionTarget": revision_target,
+    "AutomatedSnapshotRetentionPeriod": automated_snapshot_retention_period,
+    "Encrypted": encrypted,
+    "Port": port,
+    "NumberOfNodes": number_of_nodes,
+    "DestinationRegion": destination_region,
+    "AllowVersionUpgrade": allow_version_upgrade,
+    "NamespaceResourcePolicy": namespace_resource_policy,
+    "MaintenanceTrackName": maintenance_track_name,
+    "MultiAZ": multi_az,
+    "Tags": tags,
+    "IamRoles": iam_roles,
+    "KmsKeyId": kms_key_id,
+    "SnapshotCopyManual": snapshot_copy_manual,
+    "ManageMasterPassword": manage_master_password,
+    "AvailabilityZone": availability_zone,
+    "ClusterSecurityGroups": cluster_security_groups,
+    "MasterUserPassword": master_user_password,
+    "LoggingProperties": logging_properties,
+    "DeferMaintenance": defer_maintenance,
+    "NodeType": node_type,
+    "PubliclyAccessible": publicly_accessible,
+    "ManualSnapshotRetentionPeriod": manual_snapshot_retention_period,
+    "ResourceAction": resource_action,
+    "HsmClientCertificateIdentifier": hsm_client_certificate_identifier,
+    "ElasticIp": elastic_ip,
+    "AvailabilityZoneRelocationStatus": availability_zone_relocation_status,
+    "AquaConfigurationStatus": aqua_configuration_status,
+    "AvailabilityZoneRelocation": availability_zone_relocation,
+    "SnapshotCopyGrantName": snapshot_copy_grant_name,
+    "EnhancedVpcRouting": enhanced_vpc_routing,
+    "ClusterParameterGroupName": cluster_parameter_group_name,
+    "DeferMaintenanceEndTime": defer_maintenance_end_time,
+    "RotateEncryptionKey": rotate_encryption_key,
+    "VpcSecurityGroupIds": vpc_security_group_ids,
+    "ClusterVersion": cluster_version,
+    "HsmConfigurationIdentifier": hsm_configuration_identifier,
+    "PreferredMaintenanceWindow": preferred_maintenance_window,
+    "DeferMaintenanceStartTime": defer_maintenance_start_time,
+    "ClusterType": cluster_type,
+    "Classic": classic,
+    "MasterPasswordSecretKmsKeyId": master_password_secret_kms_key_id,
+    "DeferMaintenanceDuration": defer_maintenance_duration,
+    "SnapshotCopyRetentionPeriod": snapshot_copy_retention_period
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ClusterIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/redshift/clusters_list_only/index.md b/website/docs/services/redshift/clusters_list_only/index.md
deleted file mode 100644
index e3af0d47e..000000000
--- a/website/docs/services/redshift/clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - clusters_list_only
-  - redshift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>clusters</code> in a region or regions, for all properties use <a href="/services/redshift/clusters/"><code>clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An example resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.redshift.clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cluster_identifier",
-    "type": "string",
-    "description": "A unique identifier for the cluster. You use this identifier to refer to the cluster for any subsequent cluster operations such as deleting or modifying. All alphabetical characters must be lower case, no hypens at the end, no two consecutive hyphens. Cluster name should be unique for all clusters within an AWS account"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>clusters</code> in a region.
-```sql
-SELECT
-region,
-cluster_identifier
-FROM awscc.redshift.clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>clusters_list_only</code> resource, see <a href="/services/redshift/clusters/#permissions"><code>clusters</code></a>
-
diff --git a/website/docs/services/redshift/endpoint_accesses/index.md b/website/docs/services/redshift/endpoint_accesses/index.md
index 35d6eb597..22add9151 100644
--- a/website/docs/services/redshift/endpoint_accesses/index.md
+++ b/website/docs/services/redshift/endpoint_accesses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>endpoint_access</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "endpoint_status",
@@ -146,6 +155,23 @@ Creates, updates, deletes or gets an <code>endpoint_access</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "endpoint_name",
+    "type": "string",
+    "description": "The name of the endpoint."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointaccess.html"><code>AWS::Redshift::EndpointAccess</code></a>.
 
@@ -155,31 +181,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>endpoint_accesses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ClusterIdentifier, SubnetGroupName, EndpointName, VpcSecurityGroupIds, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>endpoint_accesses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>endpoint_accesses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>endpoint_accesses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>endpoint_accesses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -188,6 +220,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>endpoint_access</code>.
 ```sql
 SELECT
@@ -206,6 +247,19 @@ vpc_security_groups
 FROM awscc.redshift.endpoint_accesses
 WHERE region = 'us-east-1' AND data__Identifier = '<EndpointName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>endpoint_accesses</code> in a region.
+```sql
+SELECT
+region,
+endpoint_name
+FROM awscc.redshift.endpoint_accesses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -289,6 +343,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.redshift.endpoint_accesses
+SET data__PatchDocument = string('{{ {
+    "VpcSecurityGroupIds": vpc_security_group_ids
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<EndpointName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/redshift/endpoint_accesses_list_only/index.md b/website/docs/services/redshift/endpoint_accesses_list_only/index.md
deleted file mode 100644
index df5f4794c..000000000
--- a/website/docs/services/redshift/endpoint_accesses_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: endpoint_accesses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - endpoint_accesses_list_only
-  - redshift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>endpoint_accesses</code> in a region or regions, for all properties use <a href="/services/redshift/endpoint_accesses/"><code>endpoint_accesses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>endpoint_accesses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for a Redshift-managed VPC endpoint.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.redshift.endpoint_accesses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "endpoint_name",
-    "type": "string",
-    "description": "The name of the endpoint."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>endpoint_accesses</code> in a region.
-```sql
-SELECT
-region,
-endpoint_name
-FROM awscc.redshift.endpoint_accesses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>endpoint_accesses_list_only</code> resource, see <a href="/services/redshift/endpoint_accesses/#permissions"><code>endpoint_accesses</code></a>
-
diff --git a/website/docs/services/redshift/endpoint_authorizations/index.md b/website/docs/services/redshift/endpoint_authorizations/index.md
index 6072248f0..06fd631f1 100644
--- a/website/docs/services/redshift/endpoint_authorizations/index.md
+++ b/website/docs/services/redshift/endpoint_authorizations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>endpoint_authorization</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "status",
@@ -90,6 +99,23 @@ Creates, updates, deletes or gets an <code>endpoint_authorization</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_identifier",
+    "type": "string",
+    "description": "The cluster identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointauthorization.html"><code>AWS::Redshift::EndpointAuthorization</code></a>.
 
@@ -99,31 +125,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>endpoint_authorizations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ClusterIdentifier, Account, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>endpoint_authorizations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>endpoint_authorizations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>endpoint_authorizations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>endpoint_authorizations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -132,6 +164,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>endpoint_authorization</code>.
 ```sql
 SELECT
@@ -151,6 +192,20 @@ cluster_status
 FROM awscc.redshift.endpoint_authorizations
 WHERE region = 'us-east-1' AND data__Identifier = '<ClusterIdentifier>|<Account>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>endpoint_authorizations</code> in a region.
+```sql
+SELECT
+region,
+cluster_identifier,
+account
+FROM awscc.redshift.endpoint_authorizations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -226,6 +281,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.redshift.endpoint_authorizations
+SET data__PatchDocument = string('{{ {
+    "Force": force,
+    "VpcIds": vpc_ids
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ClusterIdentifier>|<Account>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/redshift/endpoint_authorizations_list_only/index.md b/website/docs/services/redshift/endpoint_authorizations_list_only/index.md
deleted file mode 100644
index beb12c124..000000000
--- a/website/docs/services/redshift/endpoint_authorizations_list_only/index.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-title: endpoint_authorizations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - endpoint_authorizations_list_only
-  - redshift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>endpoint_authorizations</code> in a region or regions, for all properties use <a href="/services/redshift/endpoint_authorizations/"><code>endpoint_authorizations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>endpoint_authorizations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Describes an endpoint authorization for authorizing Redshift-managed VPC endpoint access to a cluster across AWS accounts.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.redshift.endpoint_authorizations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cluster_identifier",
-    "type": "string",
-    "description": "The cluster identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>endpoint_authorizations</code> in a region.
-```sql
-SELECT
-region,
-cluster_identifier,
-account
-FROM awscc.redshift.endpoint_authorizations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>endpoint_authorizations_list_only</code> resource, see <a href="/services/redshift/endpoint_authorizations/#permissions"><code>endpoint_authorizations</code></a>
-
diff --git a/website/docs/services/redshift/event_subscriptions/index.md b/website/docs/services/redshift/event_subscriptions/index.md
index 5304e789b..7f05f9bba 100644
--- a/website/docs/services/redshift/event_subscriptions/index.md
+++ b/website/docs/services/redshift/event_subscriptions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>event_subscription</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "status",
@@ -122,6 +131,23 @@ Creates, updates, deletes or gets an <code>event_subscription</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "subscription_name",
+    "type": "string",
+    "description": "The name of the Amazon Redshift event notification subscription"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-eventsubscription.html"><code>AWS::Redshift::EventSubscription</code></a>.
 
@@ -131,31 +157,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>event_subscriptions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SubscriptionName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>event_subscriptions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>event_subscriptions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>event_subscriptions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>event_subscriptions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -164,6 +196,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>event_subscription</code>.
 ```sql
 SELECT
@@ -185,6 +226,19 @@ tags
 FROM awscc.redshift.event_subscriptions
 WHERE region = 'us-east-1' AND data__Identifier = '<SubscriptionName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>event_subscriptions</code> in a region.
+```sql
+SELECT
+region,
+subscription_name
+FROM awscc.redshift.event_subscriptions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -277,6 +331,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.redshift.event_subscriptions
+SET data__PatchDocument = string('{{ {
+    "SourceType": source_type,
+    "EventCategories": event_categories,
+    "Enabled": enabled,
+    "Severity": severity,
+    "SourceIds": source_ids,
+    "SnsTopicArn": sns_topic_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SubscriptionName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/redshift/event_subscriptions_list_only/index.md b/website/docs/services/redshift/event_subscriptions_list_only/index.md
deleted file mode 100644
index 536ef6641..000000000
--- a/website/docs/services/redshift/event_subscriptions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: event_subscriptions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - event_subscriptions_list_only
-  - redshift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>event_subscriptions</code> in a region or regions, for all properties use <a href="/services/redshift/event_subscriptions/"><code>event_subscriptions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>event_subscriptions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;AWS::Redshift::EventSubscription&#96; resource creates an Amazon Redshift Event Subscription.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.redshift.event_subscriptions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "subscription_name",
-    "type": "string",
-    "description": "The name of the Amazon Redshift event notification subscription"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>event_subscriptions</code> in a region.
-```sql
-SELECT
-region,
-subscription_name
-FROM awscc.redshift.event_subscriptions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>event_subscriptions_list_only</code> resource, see <a href="/services/redshift/event_subscriptions/#permissions"><code>event_subscriptions</code></a>
-
diff --git a/website/docs/services/redshift/index.md b/website/docs/services/redshift/index.md
index 1844cf66e..d4c27c1c2 100644
--- a/website/docs/services/redshift/index.md
+++ b/website/docs/services/redshift/index.md
@@ -20,7 +20,7 @@ The redshift service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>16</b></span><br />
+<span>total resources:&nbsp;<b>8</b></span><br />
 </div>
 </div>
 
@@ -30,22 +30,14 @@ The redshift service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/redshift/cluster_parameter_groups/">cluster_parameter_groups</a><br />
-<a href="/services/redshift/cluster_parameter_groups_list_only/">cluster_parameter_groups_list_only</a><br />
 <a href="/services/redshift/cluster_subnet_groups/">cluster_subnet_groups</a><br />
-<a href="/services/redshift/cluster_subnet_groups_list_only/">cluster_subnet_groups_list_only</a><br />
 <a href="/services/redshift/clusters/">clusters</a><br />
-<a href="/services/redshift/clusters_list_only/">clusters_list_only</a><br />
-<a href="/services/redshift/endpoint_accesses/">endpoint_accesses</a><br />
-<a href="/services/redshift/endpoint_accesses_list_only/">endpoint_accesses_list_only</a>
+<a href="/services/redshift/endpoint_accesses/">endpoint_accesses</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/redshift/endpoint_authorizations/">endpoint_authorizations</a><br />
-<a href="/services/redshift/endpoint_authorizations_list_only/">endpoint_authorizations_list_only</a><br />
 <a href="/services/redshift/event_subscriptions/">event_subscriptions</a><br />
-<a href="/services/redshift/event_subscriptions_list_only/">event_subscriptions_list_only</a><br />
 <a href="/services/redshift/integrations/">integrations</a><br />
-<a href="/services/redshift/integrations_list_only/">integrations_list_only</a><br />
-<a href="/services/redshift/scheduled_actions/">scheduled_actions</a><br />
-<a href="/services/redshift/scheduled_actions_list_only/">scheduled_actions_list_only</a>
+<a href="/services/redshift/scheduled_actions/">scheduled_actions</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/redshift/integrations/index.md b/website/docs/services/redshift/integrations/index.md
index 2595bc927..b63d4433f 100644
--- a/website/docs/services/redshift/integrations/index.md
+++ b/website/docs/services/redshift/integrations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>integration</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "integration_arn",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets an <code>integration</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "integration_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the integration."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-integration.html"><code>AWS::Redshift::Integration</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SourceArn, TargetArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>integrations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>integrations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>integration</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ additional_encryption_context
 FROM awscc.redshift.integrations
 WHERE region = 'us-east-1' AND data__Identifier = '<IntegrationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>integrations</code> in a region.
+```sql
+SELECT
+region,
+integration_arn
+FROM awscc.redshift.integrations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -233,6 +287,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.redshift.integrations
+SET data__PatchDocument = string('{{ {
+    "IntegrationName": integration_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IntegrationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/redshift/integrations_list_only/index.md b/website/docs/services/redshift/integrations_list_only/index.md
deleted file mode 100644
index 673ea4b94..000000000
--- a/website/docs/services/redshift/integrations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: integrations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - integrations_list_only
-  - redshift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>integrations</code> in a region or regions, for all properties use <a href="/services/redshift/integrations/"><code>integrations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>integrations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Integration from a source AWS service to a Redshift cluster</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.redshift.integrations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "integration_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the integration."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>integrations</code> in a region.
-```sql
-SELECT
-region,
-integration_arn
-FROM awscc.redshift.integrations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>integrations_list_only</code> resource, see <a href="/services/redshift/integrations/#permissions"><code>integrations</code></a>
-
diff --git a/website/docs/services/redshift/scheduled_actions/index.md b/website/docs/services/redshift/scheduled_actions/index.md
index 46ba15fe7..167ae47bb 100644
--- a/website/docs/services/redshift/scheduled_actions/index.md
+++ b/website/docs/services/redshift/scheduled_actions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>scheduled_action</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "scheduled_action_description",
@@ -85,6 +94,28 @@ Creates, updates, deletes or gets a <code>scheduled_action</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "scheduled_action_name",
+    "type": "string",
+    "description": "The name of the scheduled action. The name must be unique within an account."
+  },
+  {
+    "name": "schedule",
+    "type": "string",
+    "description": "The schedule in &#96;at( )&#96; or &#96;cron( )&#96; format."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-scheduledaction.html"><code>AWS::Redshift::ScheduledAction</code></a>.
 
@@ -94,31 +125,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>scheduled_actions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ScheduledActionName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>scheduled_actions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>scheduled_actions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>scheduled_actions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>scheduled_actions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -127,6 +164,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>scheduled_action</code>.
 ```sql
 SELECT
@@ -144,6 +190,19 @@ next_invocations
 FROM awscc.redshift.scheduled_actions
 WHERE region = 'us-east-1' AND data__Identifier = '<ScheduledActionName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>scheduled_actions</code> in a region.
+```sql
+SELECT
+region,
+scheduled_action_name
+FROM awscc.redshift.scheduled_actions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -232,6 +291,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.redshift.scheduled_actions
+SET data__PatchDocument = string('{{ {
+    "ScheduledActionDescription": scheduled_action_description,
+    "EndTime": end_time,
+    "Schedule": schedule,
+    "IamRole": iam_role,
+    "StartTime": start_time,
+    "Enable": enable,
+    "TargetAction": target_action
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ScheduledActionName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/redshift/scheduled_actions_list_only/index.md b/website/docs/services/redshift/scheduled_actions_list_only/index.md
deleted file mode 100644
index 7fa16ce72..000000000
--- a/website/docs/services/redshift/scheduled_actions_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: scheduled_actions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - scheduled_actions_list_only
-  - redshift
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>scheduled_actions</code> in a region or regions, for all properties use <a href="/services/redshift/scheduled_actions/"><code>scheduled_actions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>scheduled_actions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;AWS::Redshift::ScheduledAction&#96; resource creates an Amazon Redshift Scheduled Action.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.redshift.scheduled_actions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "scheduled_action_name",
-    "type": "string",
-    "description": "The name of the scheduled action. The name must be unique within an account."
-  },
-  {
-    "name": "schedule",
-    "type": "string",
-    "description": "The schedule in &#96;at( )&#96; or &#96;cron( )&#96; format."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>scheduled_actions</code> in a region.
-```sql
-SELECT
-region,
-scheduled_action_name
-FROM awscc.redshift.scheduled_actions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>scheduled_actions_list_only</code> resource, see <a href="/services/redshift/scheduled_actions/#permissions"><code>scheduled_actions</code></a>
-
diff --git a/website/docs/services/redshiftserverless/index.md b/website/docs/services/redshiftserverless/index.md
index 449f11fcf..4f9778fae 100644
--- a/website/docs/services/redshiftserverless/index.md
+++ b/website/docs/services/redshiftserverless/index.md
@@ -20,7 +20,7 @@ The redshiftserverless service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The redshiftserverless service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/redshiftserverless/namespaces/">namespaces</a><br />
-<a href="/services/redshiftserverless/namespaces_list_only/">namespaces_list_only</a><br />
 <a href="/services/redshiftserverless/snapshots/">snapshots</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/redshiftserverless/snapshots_list_only/">snapshots_list_only</a><br />
-<a href="/services/redshiftserverless/workgroups/">workgroups</a><br />
-<a href="/services/redshiftserverless/workgroups_list_only/">workgroups_list_only</a>
+<a href="/services/redshiftserverless/workgroups/">workgroups</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/redshiftserverless/namespaces/index.md b/website/docs/services/redshiftserverless/namespaces/index.md
index d389159b2..4351fb5b0 100644
--- a/website/docs/services/redshiftserverless/namespaces/index.md
+++ b/website/docs/services/redshiftserverless/namespaces/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>namespace</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "admin_password_secret_kms_key_id",
@@ -265,6 +274,139 @@ Creates, updates, deletes or gets a <code>namespace</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "namespace",
+    "type": "object",
+    "description": "Definition of Namespace resource.",
+    "children": [
+      {
+        "name": "admin_password_secret_kms_key_id",
+        "type": "string",
+        "description": "The ID of the AWS Key Management Service (KMS) key used to encrypt and store the namespace's admin credentials secret. You can only use this parameter if manageAdminPassword is true."
+      },
+      {
+        "name": "admin_user_password",
+        "type": "string",
+        "description": "The password associated with the admin user for the namespace that is being created. Password must be at least 8 characters in length, should be any printable ASCII character. Must contain at least one lowercase letter, one uppercase letter and one decimal digit. You can't use adminUserPassword if manageAdminPassword is true."
+      },
+      {
+        "name": "admin_username",
+        "type": "string",
+        "description": "The user name associated with the admin user for the namespace that is being created. Only alphanumeric characters and underscores are allowed. It should start with an alphabet."
+      },
+      {
+        "name": "db_name",
+        "type": "string",
+        "description": "The database name associated for the namespace that is being created. Only alphanumeric characters and underscores are allowed. It should start with an alphabet."
+      },
+      {
+        "name": "default_iam_role_arn",
+        "type": "string",
+        "description": "The default IAM role ARN for the namespace that is being created."
+      },
+      {
+        "name": "iam_roles",
+        "type": "array",
+        "description": "A list of AWS Identity and Access Management (IAM) roles that can be used by the namespace to access other AWS services. You must supply the IAM roles in their Amazon Resource Name (ARN) format. The Default role limit for each request is 10."
+      },
+      {
+        "name": "kms_key_id",
+        "type": "string",
+        "description": "The AWS Key Management Service (KMS) key ID of the encryption key that you want to use to encrypt data in the namespace."
+      },
+      {
+        "name": "log_exports",
+        "type": "array",
+        "description": "The collection of log types to be exported provided by the customer. Should only be one of the three supported log types: userlog, useractivitylog and connectionlog"
+      },
+      {
+        "name": "manage_admin_password",
+        "type": "boolean",
+        "description": "If true, Amazon Redshift uses AWS Secrets Manager to manage the namespace's admin credentials. You can't use adminUserPassword if manageAdminPassword is true. If manageAdminPassword is false or not set, Amazon Redshift uses adminUserPassword for the admin user account's password."
+      },
+      {
+        "name": "namespace_name",
+        "type": "string",
+        "description": "A unique identifier for the namespace. You use this identifier to refer to the namespace for any subsequent namespace operations such as deleting or modifying. All alphabetical characters must be lower case. Namespace name should be unique for all namespaces within an AWS account."
+      },
+      {
+        "name": "tags",
+        "type": "array",
+        "description": "The list of tags for the namespace.",
+        "children": [
+          {
+            "name": "key",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "value",
+            "type": "string",
+            "description": ""
+          }
+        ]
+      },
+      {
+        "name": "final_snapshot_name",
+        "type": "string",
+        "description": "The name of the namespace the source snapshot was created from. Please specify the name if needed before deleting namespace"
+      },
+      {
+        "name": "final_snapshot_retention_period",
+        "type": "integer",
+        "description": "The number of days to retain automated snapshot in the destination region after they are copied from the source region. If the value is -1, the manual snapshot is retained indefinitely. The value must be either -1 or an integer between 1 and 3,653."
+      },
+      {
+        "name": "namespace_resource_policy",
+        "type": "object",
+        "description": "The resource policy document that will be attached to the namespace."
+      },
+      {
+        "name": "redshift_idc_application_arn",
+        "type": "string",
+        "description": "The ARN for the Redshift application that integrates with IAM Identity Center."
+      },
+      {
+        "name": "snapshot_copy_configurations",
+        "type": "array",
+        "description": "The snapshot copy configurations for the namespace.",
+        "children": [
+          {
+            "name": "destination_region",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "destination_kms_key_id",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "snapshot_retention_period",
+            "type": "integer",
+            "description": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "namespace_name",
+    "type": "string",
+    "description": "A unique identifier for the namespace. You use this identifier to refer to the namespace for any subsequent namespace operations such as deleting or modifying. All alphabetical characters must be lower case. Namespace name should be unique for all namespaces within an AWS account."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-namespace.html"><code>AWS::RedshiftServerless::Namespace</code></a>.
 
@@ -274,31 +416,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>namespaces</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="NamespaceName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>namespaces</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>namespaces</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>namespaces_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>namespaces</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -307,6 +455,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>namespace</code>.
 ```sql
 SELECT
@@ -331,6 +488,19 @@ snapshot_copy_configurations
 FROM awscc.redshiftserverless.namespaces
 WHERE region = 'us-east-1' AND data__Identifier = '<NamespaceName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>namespaces</code> in a region.
+```sql
+SELECT
+region,
+namespace_name
+FROM awscc.redshiftserverless.namespaces_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -458,6 +628,33 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.redshiftserverless.namespaces
+SET data__PatchDocument = string('{{ {
+    "AdminPasswordSecretKmsKeyId": admin_password_secret_kms_key_id,
+    "AdminUserPassword": admin_user_password,
+    "AdminUsername": admin_username,
+    "DbName": db_name,
+    "DefaultIamRoleArn": default_iam_role_arn,
+    "IamRoles": iam_roles,
+    "KmsKeyId": kms_key_id,
+    "LogExports": log_exports,
+    "ManageAdminPassword": manage_admin_password,
+    "Tags": tags,
+    "FinalSnapshotName": final_snapshot_name,
+    "FinalSnapshotRetentionPeriod": final_snapshot_retention_period,
+    "NamespaceResourcePolicy": namespace_resource_policy,
+    "RedshiftIdcApplicationArn": redshift_idc_application_arn,
+    "SnapshotCopyConfigurations": snapshot_copy_configurations
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<NamespaceName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/redshiftserverless/namespaces_list_only/index.md b/website/docs/services/redshiftserverless/namespaces_list_only/index.md
deleted file mode 100644
index 68e5e1a6e..000000000
--- a/website/docs/services/redshiftserverless/namespaces_list_only/index.md
+++ /dev/null
@@ -1,196 +0,0 @@
----
-title: namespaces_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - namespaces_list_only
-  - redshiftserverless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>namespaces</code> in a region or regions, for all properties use <a href="/services/redshiftserverless/namespaces/"><code>namespaces</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>namespaces_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::RedshiftServerless::Namespace Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.redshiftserverless.namespaces_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "namespace",
-    "type": "object",
-    "description": "Definition of Namespace resource.",
-    "children": [
-      {
-        "name": "admin_password_secret_kms_key_id",
-        "type": "string",
-        "description": "The ID of the AWS Key Management Service (KMS) key used to encrypt and store the namespace's admin credentials secret. You can only use this parameter if manageAdminPassword is true."
-      },
-      {
-        "name": "admin_user_password",
-        "type": "string",
-        "description": "The password associated with the admin user for the namespace that is being created. Password must be at least 8 characters in length, should be any printable ASCII character. Must contain at least one lowercase letter, one uppercase letter and one decimal digit. You can't use adminUserPassword if manageAdminPassword is true."
-      },
-      {
-        "name": "admin_username",
-        "type": "string",
-        "description": "The user name associated with the admin user for the namespace that is being created. Only alphanumeric characters and underscores are allowed. It should start with an alphabet."
-      },
-      {
-        "name": "db_name",
-        "type": "string",
-        "description": "The database name associated for the namespace that is being created. Only alphanumeric characters and underscores are allowed. It should start with an alphabet."
-      },
-      {
-        "name": "default_iam_role_arn",
-        "type": "string",
-        "description": "The default IAM role ARN for the namespace that is being created."
-      },
-      {
-        "name": "iam_roles",
-        "type": "array",
-        "description": "A list of AWS Identity and Access Management (IAM) roles that can be used by the namespace to access other AWS services. You must supply the IAM roles in their Amazon Resource Name (ARN) format. The Default role limit for each request is 10."
-      },
-      {
-        "name": "kms_key_id",
-        "type": "string",
-        "description": "The AWS Key Management Service (KMS) key ID of the encryption key that you want to use to encrypt data in the namespace."
-      },
-      {
-        "name": "log_exports",
-        "type": "array",
-        "description": "The collection of log types to be exported provided by the customer. Should only be one of the three supported log types: userlog, useractivitylog and connectionlog"
-      },
-      {
-        "name": "manage_admin_password",
-        "type": "boolean",
-        "description": "If true, Amazon Redshift uses AWS Secrets Manager to manage the namespace's admin credentials. You can't use adminUserPassword if manageAdminPassword is true. If manageAdminPassword is false or not set, Amazon Redshift uses adminUserPassword for the admin user account's password."
-      },
-      {
-        "name": "namespace_name",
-        "type": "string",
-        "description": "A unique identifier for the namespace. You use this identifier to refer to the namespace for any subsequent namespace operations such as deleting or modifying. All alphabetical characters must be lower case. Namespace name should be unique for all namespaces within an AWS account."
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "The list of tags for the namespace.",
-        "children": [
-          {
-            "name": "key",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "value",
-            "type": "string",
-            "description": ""
-          }
-        ]
-      },
-      {
-        "name": "final_snapshot_name",
-        "type": "string",
-        "description": "The name of the namespace the source snapshot was created from. Please specify the name if needed before deleting namespace"
-      },
-      {
-        "name": "final_snapshot_retention_period",
-        "type": "integer",
-        "description": "The number of days to retain automated snapshot in the destination region after they are copied from the source region. If the value is -1, the manual snapshot is retained indefinitely. The value must be either -1 or an integer between 1 and 3,653."
-      },
-      {
-        "name": "namespace_resource_policy",
-        "type": "object",
-        "description": "The resource policy document that will be attached to the namespace."
-      },
-      {
-        "name": "redshift_idc_application_arn",
-        "type": "string",
-        "description": "The ARN for the Redshift application that integrates with IAM Identity Center."
-      },
-      {
-        "name": "snapshot_copy_configurations",
-        "type": "array",
-        "description": "The snapshot copy configurations for the namespace.",
-        "children": [
-          {
-            "name": "destination_region",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "destination_kms_key_id",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "snapshot_retention_period",
-            "type": "integer",
-            "description": ""
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "namespace_name",
-    "type": "string",
-    "description": "A unique identifier for the namespace. You use this identifier to refer to the namespace for any subsequent namespace operations such as deleting or modifying. All alphabetical characters must be lower case. Namespace name should be unique for all namespaces within an AWS account."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>namespaces</code> in a region.
-```sql
-SELECT
-region,
-namespace_name
-FROM awscc.redshiftserverless.namespaces_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>namespaces_list_only</code> resource, see <a href="/services/redshiftserverless/namespaces/#permissions"><code>namespaces</code></a>
-
diff --git a/website/docs/services/redshiftserverless/snapshots/index.md b/website/docs/services/redshiftserverless/snapshots/index.md
index ffd665f27..a05a992fe 100644
--- a/website/docs/services/redshiftserverless/snapshots/index.md
+++ b/website/docs/services/redshiftserverless/snapshots/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>snapshot</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "snapshot_name",
@@ -109,6 +118,55 @@ Creates, updates, deletes or gets a <code>snapshot</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "snapshot_name",
+    "type": "string",
+    "description": "The name of the snapshot."
+  },
+  {
+    "name": "snapshot",
+    "type": "object",
+    "description": "Definition for snapshot resource",
+    "children": [
+      {
+        "name": "snapshot_name",
+        "type": "string",
+        "description": "The name of the snapshot."
+      },
+      {
+        "name": "namespace_name",
+        "type": "string",
+        "description": "The namespace the snapshot is associated with."
+      },
+      {
+        "name": "owner_account",
+        "type": "string",
+        "description": "The owner account of the snapshot."
+      },
+      {
+        "name": "retention_period",
+        "type": "integer",
+        "description": "The retention period of the snapshot."
+      },
+      {
+        "name": "tags",
+        "type": "array",
+        "description": "An array of key-value pairs to apply to this resource."
+      }
+    ]
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-snapshot.html"><code>AWS::RedshiftServerless::Snapshot</code></a>.
 
@@ -118,31 +176,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>snapshots</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SnapshotName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>snapshots</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>snapshots</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>snapshots_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>snapshots</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +215,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>snapshot</code>.
 ```sql
 SELECT
@@ -164,6 +237,19 @@ snapshot
 FROM awscc.redshiftserverless.snapshots
 WHERE region = 'us-east-1' AND data__Identifier = '<SnapshotName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>snapshots</code> in a region.
+```sql
+SELECT
+region,
+snapshot_name
+FROM awscc.redshiftserverless.snapshots_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -238,6 +324,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.redshiftserverless.snapshots
+SET data__PatchDocument = string('{{ {
+    "RetentionPeriod": retention_period
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SnapshotName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/redshiftserverless/snapshots_list_only/index.md b/website/docs/services/redshiftserverless/snapshots_list_only/index.md
deleted file mode 100644
index 677b40ec9..000000000
--- a/website/docs/services/redshiftserverless/snapshots_list_only/index.md
+++ /dev/null
@@ -1,112 +0,0 @@
----
-title: snapshots_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - snapshots_list_only
-  - redshiftserverless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>snapshots</code> in a region or regions, for all properties use <a href="/services/redshiftserverless/snapshots/"><code>snapshots</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>snapshots_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::RedshiftServerless::Snapshot Resource Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.redshiftserverless.snapshots_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "snapshot_name",
-    "type": "string",
-    "description": "The name of the snapshot."
-  },
-  {
-    "name": "snapshot",
-    "type": "object",
-    "description": "Definition for snapshot resource",
-    "children": [
-      {
-        "name": "snapshot_name",
-        "type": "string",
-        "description": "The name of the snapshot."
-      },
-      {
-        "name": "namespace_name",
-        "type": "string",
-        "description": "The namespace the snapshot is associated with."
-      },
-      {
-        "name": "owner_account",
-        "type": "string",
-        "description": "The owner account of the snapshot."
-      },
-      {
-        "name": "retention_period",
-        "type": "integer",
-        "description": "The retention period of the snapshot."
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "An array of key-value pairs to apply to this resource."
-      }
-    ]
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>snapshots</code> in a region.
-```sql
-SELECT
-region,
-snapshot_name
-FROM awscc.redshiftserverless.snapshots_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>snapshots_list_only</code> resource, see <a href="/services/redshiftserverless/snapshots/#permissions"><code>snapshots</code></a>
-
diff --git a/website/docs/services/redshiftserverless/workgroups/index.md b/website/docs/services/redshiftserverless/workgroups/index.md
index f0c95b7fc..1f3958ea0 100644
--- a/website/docs/services/redshiftserverless/workgroups/index.md
+++ b/website/docs/services/redshiftserverless/workgroups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>workgroup</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "workgroup_name",
@@ -248,6 +257,110 @@ Creates, updates, deletes or gets a <code>workgroup</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "workgroup_name",
+    "type": "string",
+    "description": "The name of the workgroup."
+  },
+  {
+    "name": "workgroup",
+    "type": "object",
+    "description": "Definition for workgroup resource",
+    "children": [
+      {
+        "name": "workgroup_name",
+        "type": "string",
+        "description": "The name of the workgroup."
+      },
+      {
+        "name": "namespace_name",
+        "type": "string",
+        "description": "The namespace the workgroup is associated with."
+      },
+      {
+        "name": "base_capacity",
+        "type": "integer",
+        "description": "The base compute capacity of the workgroup in Redshift Processing Units (RPUs)."
+      },
+      {
+        "name": "max_capacity",
+        "type": "integer",
+        "description": "The max compute capacity of the workgroup in Redshift Processing Units (RPUs)."
+      },
+      {
+        "name": "enhanced_vpc_routing",
+        "type": "boolean",
+        "description": "The value that specifies whether to enable enhanced virtual private cloud (VPC) routing, which forces Amazon Redshift Serverless to route traffic through your VPC."
+      },
+      {
+        "name": "config_parameters",
+        "type": "array",
+        "description": "A list of parameters to set for finer control over a database. Available options are datestyle, enable&#95;user&#95;activity&#95;logging, query&#95;group, search&#95;path, max&#95;query&#95;execution&#95;time, and require&#95;ssl."
+      },
+      {
+        "name": "security_group_ids",
+        "type": "array",
+        "description": "A list of security group IDs to associate with the workgroup."
+      },
+      {
+        "name": "subnet_ids",
+        "type": "array",
+        "description": "A list of subnet IDs the workgroup is associated with."
+      },
+      {
+        "name": "publicly_accessible",
+        "type": "boolean",
+        "description": "A value that specifies whether the workgroup can be accessible from a public network."
+      },
+      {
+        "name": "port",
+        "type": "integer",
+        "description": "The custom port to use when connecting to a workgroup. Valid port ranges are 5431-5455 and 8191-8215. The default is 5439."
+      },
+      {
+        "name": "snapshot_arn",
+        "type": "string",
+        "description": "The Amazon Resource Name (ARN) of the snapshot to restore from."
+      },
+      {
+        "name": "snapshot_name",
+        "type": "string",
+        "description": "The snapshot name to restore from."
+      },
+      {
+        "name": "snapshot_owner_account",
+        "type": "string",
+        "description": "The Amazon Web Services account that owns the snapshot."
+      },
+      {
+        "name": "recovery_point_id",
+        "type": "string",
+        "description": "The recovery point id to restore from."
+      },
+      {
+        "name": "tags",
+        "type": "array",
+        "description": "The map of the key-value pairs used to tag the workgroup."
+      },
+      {
+        "name": "track_name",
+        "type": "string",
+        "description": ""
+      }
+    ]
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-workgroup.html"><code>AWS::RedshiftServerless::Workgroup</code></a>.
 
@@ -257,31 +370,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>workgroups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="WorkgroupName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>workgroups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>workgroups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>workgroups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>workgroups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -290,6 +409,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>workgroup</code>.
 ```sql
 SELECT
@@ -315,6 +443,19 @@ workgroup
 FROM awscc.redshiftserverless.workgroups
 WHERE region = 'us-east-1' AND data__Identifier = '<WorkgroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>workgroups</code> in a region.
+```sql
+SELECT
+region,
+workgroup_name
+FROM awscc.redshiftserverless.workgroups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -473,6 +614,33 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.redshiftserverless.workgroups
+SET data__PatchDocument = string('{{ {
+    "BaseCapacity": base_capacity,
+    "MaxCapacity": max_capacity,
+    "EnhancedVpcRouting": enhanced_vpc_routing,
+    "ConfigParameters": config_parameters,
+    "SecurityGroupIds": security_group_ids,
+    "SubnetIds": subnet_ids,
+    "PubliclyAccessible": publicly_accessible,
+    "Port": port,
+    "PricePerformanceTarget": price_performance_target,
+    "SnapshotArn": snapshot_arn,
+    "SnapshotName": snapshot_name,
+    "SnapshotOwnerAccount": snapshot_owner_account,
+    "RecoveryPointId": recovery_point_id,
+    "Tags": tags,
+    "TrackName": track_name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<WorkgroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/redshiftserverless/workgroups_list_only/index.md b/website/docs/services/redshiftserverless/workgroups_list_only/index.md
deleted file mode 100644
index 0e6bf7bc0..000000000
--- a/website/docs/services/redshiftserverless/workgroups_list_only/index.md
+++ /dev/null
@@ -1,167 +0,0 @@
----
-title: workgroups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - workgroups_list_only
-  - redshiftserverless
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>workgroups</code> in a region or regions, for all properties use <a href="/services/redshiftserverless/workgroups/"><code>workgroups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>workgroups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::RedshiftServerless::Workgroup Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.redshiftserverless.workgroups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "workgroup_name",
-    "type": "string",
-    "description": "The name of the workgroup."
-  },
-  {
-    "name": "workgroup",
-    "type": "object",
-    "description": "Definition for workgroup resource",
-    "children": [
-      {
-        "name": "workgroup_name",
-        "type": "string",
-        "description": "The name of the workgroup."
-      },
-      {
-        "name": "namespace_name",
-        "type": "string",
-        "description": "The namespace the workgroup is associated with."
-      },
-      {
-        "name": "base_capacity",
-        "type": "integer",
-        "description": "The base compute capacity of the workgroup in Redshift Processing Units (RPUs)."
-      },
-      {
-        "name": "max_capacity",
-        "type": "integer",
-        "description": "The max compute capacity of the workgroup in Redshift Processing Units (RPUs)."
-      },
-      {
-        "name": "enhanced_vpc_routing",
-        "type": "boolean",
-        "description": "The value that specifies whether to enable enhanced virtual private cloud (VPC) routing, which forces Amazon Redshift Serverless to route traffic through your VPC."
-      },
-      {
-        "name": "config_parameters",
-        "type": "array",
-        "description": "A list of parameters to set for finer control over a database. Available options are datestyle, enable&#95;user&#95;activity&#95;logging, query&#95;group, search&#95;path, max&#95;query&#95;execution&#95;time, and require&#95;ssl."
-      },
-      {
-        "name": "security_group_ids",
-        "type": "array",
-        "description": "A list of security group IDs to associate with the workgroup."
-      },
-      {
-        "name": "subnet_ids",
-        "type": "array",
-        "description": "A list of subnet IDs the workgroup is associated with."
-      },
-      {
-        "name": "publicly_accessible",
-        "type": "boolean",
-        "description": "A value that specifies whether the workgroup can be accessible from a public network."
-      },
-      {
-        "name": "port",
-        "type": "integer",
-        "description": "The custom port to use when connecting to a workgroup. Valid port ranges are 5431-5455 and 8191-8215. The default is 5439."
-      },
-      {
-        "name": "snapshot_arn",
-        "type": "string",
-        "description": "The Amazon Resource Name (ARN) of the snapshot to restore from."
-      },
-      {
-        "name": "snapshot_name",
-        "type": "string",
-        "description": "The snapshot name to restore from."
-      },
-      {
-        "name": "snapshot_owner_account",
-        "type": "string",
-        "description": "The Amazon Web Services account that owns the snapshot."
-      },
-      {
-        "name": "recovery_point_id",
-        "type": "string",
-        "description": "The recovery point id to restore from."
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "The map of the key-value pairs used to tag the workgroup."
-      },
-      {
-        "name": "track_name",
-        "type": "string",
-        "description": ""
-      }
-    ]
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>workgroups</code> in a region.
-```sql
-SELECT
-region,
-workgroup_name
-FROM awscc.redshiftserverless.workgroups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>workgroups_list_only</code> resource, see <a href="/services/redshiftserverless/workgroups/#permissions"><code>workgroups</code></a>
-
diff --git a/website/docs/services/refactorspaces/applications/index.md b/website/docs/services/refactorspaces/applications/index.md
index ff7e0ea08..93f67dc36 100644
--- a/website/docs/services/refactorspaces/applications/index.md
+++ b/website/docs/services/refactorspaces/applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "api_gateway_proxy",
@@ -134,6 +143,28 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "environment_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-application.html"><code>AWS::RefactorSpaces::Application</code></a>.
 
@@ -143,26 +174,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EnvironmentIdentifier, VpcId, Name, ProxyType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -171,6 +207,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application</code>.
 ```sql
 SELECT
@@ -192,6 +237,20 @@ tags
 FROM awscc.refactorspaces.applications
 WHERE region = 'us-east-1' AND data__Identifier = '<EnvironmentIdentifier>|<ApplicationIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>applications</code> in a region.
+```sql
+SELECT
+region,
+environment_identifier,
+application_identifier
+FROM awscc.refactorspaces.applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -282,6 +341,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/refactorspaces/applications_list_only/index.md b/website/docs/services/refactorspaces/applications_list_only/index.md
deleted file mode 100644
index 1a04b3989..000000000
--- a/website/docs/services/refactorspaces/applications_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - applications_list_only
-  - refactorspaces
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>applications</code> in a region or regions, for all properties use <a href="/services/refactorspaces/applications/"><code>applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::RefactorSpaces::Application Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.refactorspaces.applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "environment_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>applications</code> in a region.
-```sql
-SELECT
-region,
-environment_identifier,
-application_identifier
-FROM awscc.refactorspaces.applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>applications_list_only</code> resource, see <a href="/services/refactorspaces/applications/#permissions"><code>applications</code></a>
-
diff --git a/website/docs/services/refactorspaces/environments/index.md b/website/docs/services/refactorspaces/environments/index.md
index 3ee03fd8c..8092138c1 100644
--- a/website/docs/services/refactorspaces/environments/index.md
+++ b/website/docs/services/refactorspaces/environments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "environment_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-environment.html"><code>AWS::RefactorSpaces::Environment</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>environments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>environment</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.refactorspaces.environments
 WHERE region = 'us-east-1' AND data__Identifier = '<EnvironmentIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>environments</code> in a region.
+```sql
+SELECT
+region,
+environment_identifier
+FROM awscc.refactorspaces.environments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -223,6 +277,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.refactorspaces.environments
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<EnvironmentIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/refactorspaces/environments_list_only/index.md b/website/docs/services/refactorspaces/environments_list_only/index.md
deleted file mode 100644
index 59a7ec58d..000000000
--- a/website/docs/services/refactorspaces/environments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: environments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - environments_list_only
-  - refactorspaces
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>environments</code> in a region or regions, for all properties use <a href="/services/refactorspaces/environments/"><code>environments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>environments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::RefactorSpaces::Environment Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.refactorspaces.environments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "environment_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>environments</code> in a region.
-```sql
-SELECT
-region,
-environment_identifier
-FROM awscc.refactorspaces.environments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>environments_list_only</code> resource, see <a href="/services/refactorspaces/environments/#permissions"><code>environments</code></a>
-
diff --git a/website/docs/services/refactorspaces/index.md b/website/docs/services/refactorspaces/index.md
index 73a9e7391..592fdd724 100644
--- a/website/docs/services/refactorspaces/index.md
+++ b/website/docs/services/refactorspaces/index.md
@@ -20,7 +20,7 @@ The refactorspaces service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The refactorspaces service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/refactorspaces/applications/">applications</a><br />
-<a href="/services/refactorspaces/applications_list_only/">applications_list_only</a><br />
-<a href="/services/refactorspaces/environments/">environments</a><br />
-<a href="/services/refactorspaces/environments_list_only/">environments_list_only</a>
+<a href="/services/refactorspaces/environments/">environments</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/refactorspaces/routes/">routes</a><br />
-<a href="/services/refactorspaces/routes_list_only/">routes_list_only</a><br />
-<a href="/services/refactorspaces/services/">services</a><br />
-<a href="/services/refactorspaces/services_list_only/">services_list_only</a>
+<a href="/services/refactorspaces/services/">services</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/refactorspaces/routes/index.md b/website/docs/services/refactorspaces/routes/index.md
index 5968a6d39..25abe7313 100644
--- a/website/docs/services/refactorspaces/routes/index.md
+++ b/website/docs/services/refactorspaces/routes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>route</code> resource or lists <code>r
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "path_resource_to_id",
@@ -136,6 +145,33 @@ Creates, updates, deletes or gets a <code>route</code> resource or lists <code>r
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "environment_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "route_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-route.html"><code>AWS::RefactorSpaces::Route</code></a>.
 
@@ -145,31 +181,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>routes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EnvironmentIdentifier, ApplicationIdentifier, ServiceIdentifier, RouteType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>routes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>routes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>routes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>routes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -178,6 +220,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>route</code>.
 ```sql
 SELECT
@@ -195,6 +246,21 @@ tags
 FROM awscc.refactorspaces.routes
 WHERE region = 'us-east-1' AND data__Identifier = '<EnvironmentIdentifier>|<ApplicationIdentifier>|<RouteIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>routes</code> in a region.
+```sql
+SELECT
+region,
+environment_identifier,
+application_identifier,
+route_identifier
+FROM awscc.refactorspaces.routes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -294,6 +360,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.refactorspaces.routes
+SET data__PatchDocument = string('{{ {
+    "DefaultRoute": default_route,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<EnvironmentIdentifier>|<ApplicationIdentifier>|<RouteIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/refactorspaces/routes_list_only/index.md b/website/docs/services/refactorspaces/routes_list_only/index.md
deleted file mode 100644
index 3c315b521..000000000
--- a/website/docs/services/refactorspaces/routes_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: routes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - routes_list_only
-  - refactorspaces
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>routes</code> in a region or regions, for all properties use <a href="/services/refactorspaces/routes/"><code>routes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>routes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::RefactorSpaces::Route Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.refactorspaces.routes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "environment_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "route_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>routes</code> in a region.
-```sql
-SELECT
-region,
-environment_identifier,
-application_identifier,
-route_identifier
-FROM awscc.refactorspaces.routes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>routes_list_only</code> resource, see <a href="/services/refactorspaces/routes/#permissions"><code>routes</code></a>
-
diff --git a/website/docs/services/refactorspaces/services/index.md b/website/docs/services/refactorspaces/services/index.md
index e35964df8..7cfae02f2 100644
--- a/website/docs/services/refactorspaces/services/index.md
+++ b/website/docs/services/refactorspaces/services/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>service</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -126,6 +135,33 @@ Creates, updates, deletes or gets a <code>service</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "environment_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "service_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-service.html"><code>AWS::RefactorSpaces::Service</code></a>.
 
@@ -135,26 +171,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>services</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EnvironmentIdentifier, ApplicationIdentifier, EndpointType, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>services</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>services_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>services</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -163,6 +204,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>service</code>.
 ```sql
 SELECT
@@ -181,6 +231,21 @@ tags
 FROM awscc.refactorspaces.services
 WHERE region = 'us-east-1' AND data__Identifier = '<EnvironmentIdentifier>|<ApplicationIdentifier>|<ServiceIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>services</code> in a region.
+```sql
+SELECT
+region,
+environment_identifier,
+application_identifier,
+service_identifier
+FROM awscc.refactorspaces.services_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -284,6 +349,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/refactorspaces/services_list_only/index.md b/website/docs/services/refactorspaces/services_list_only/index.md
deleted file mode 100644
index e300d35d9..000000000
--- a/website/docs/services/refactorspaces/services_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: services_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - services_list_only
-  - refactorspaces
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>services</code> in a region or regions, for all properties use <a href="/services/refactorspaces/services/"><code>services</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>services_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::RefactorSpaces::Service Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.refactorspaces.services_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "environment_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "service_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>services</code> in a region.
-```sql
-SELECT
-region,
-environment_identifier,
-application_identifier,
-service_identifier
-FROM awscc.refactorspaces.services_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>services_list_only</code> resource, see <a href="/services/refactorspaces/services/#permissions"><code>services</code></a>
-
diff --git a/website/docs/services/rekognition/collections/index.md b/website/docs/services/rekognition/collections/index.md
index 79e593f7a..d14082a94 100644
--- a/website/docs/services/rekognition/collections/index.md
+++ b/website/docs/services/rekognition/collections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>collection</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -67,6 +76,23 @@ Creates, updates, deletes or gets a <code>collection</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "collection_id",
+    "type": "string",
+    "description": "The name of the collection"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rekognition-collection.html"><code>AWS::Rekognition::Collection</code></a>.
 
@@ -76,31 +102,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>collections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CollectionId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>collections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>collections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>collections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>collections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -109,6 +141,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>collection</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ tags
 FROM awscc.rekognition.collections
 WHERE region = 'us-east-1' AND data__Identifier = '<CollectionId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>collections</code> in a region.
+```sql
+SELECT
+region,
+collection_id
+FROM awscc.rekognition.collections_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -185,6 +239,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rekognition.collections
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CollectionId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rekognition/collections_list_only/index.md b/website/docs/services/rekognition/collections_list_only/index.md
deleted file mode 100644
index 317e7fd7a..000000000
--- a/website/docs/services/rekognition/collections_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: collections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - collections_list_only
-  - rekognition
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>collections</code> in a region or regions, for all properties use <a href="/services/rekognition/collections/"><code>collections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>collections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Rekognition::Collection type creates an Amazon Rekognition Collection. A collection is a logical grouping of information about detected faces which can later be referenced for searches on the group</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rekognition.collections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "collection_id",
-    "type": "string",
-    "description": "The name of the collection"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>collections</code> in a region.
-```sql
-SELECT
-region,
-collection_id
-FROM awscc.rekognition.collections_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>collections_list_only</code> resource, see <a href="/services/rekognition/collections/#permissions"><code>collections</code></a>
-
diff --git a/website/docs/services/rekognition/index.md b/website/docs/services/rekognition/index.md
index 02bc51257..750ba3085 100644
--- a/website/docs/services/rekognition/index.md
+++ b/website/docs/services/rekognition/index.md
@@ -20,7 +20,7 @@ The rekognition service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The rekognition service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/rekognition/collections/">collections</a><br />
-<a href="/services/rekognition/collections_list_only/">collections_list_only</a><br />
 <a href="/services/rekognition/projects/">projects</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/rekognition/projects_list_only/">projects_list_only</a><br />
-<a href="/services/rekognition/stream_processors/">stream_processors</a><br />
-<a href="/services/rekognition/stream_processors_list_only/">stream_processors_list_only</a>
+<a href="/services/rekognition/stream_processors/">stream_processors</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/rekognition/projects/index.md b/website/docs/services/rekognition/projects/index.md
index 33bd403e6..9f10a641a 100644
--- a/website/docs/services/rekognition/projects/index.md
+++ b/website/docs/services/rekognition/projects/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>project</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>project</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "project_name",
+    "type": "string",
+    "description": "The name of the project"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rekognition-project.html"><code>AWS::Rekognition::Project</code></a>.
 
@@ -59,26 +85,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ProjectName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>projects_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +118,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>project</code>.
 ```sql
 SELECT
@@ -96,6 +136,19 @@ project_name
 FROM awscc.rekognition.projects
 WHERE region = 'us-east-1' AND data__Identifier = '<ProjectName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>projects</code> in a region.
+```sql
+SELECT
+region,
+project_name
+FROM awscc.rekognition.projects_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -156,6 +209,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rekognition/projects_list_only/index.md b/website/docs/services/rekognition/projects_list_only/index.md
deleted file mode 100644
index 653caae4c..000000000
--- a/website/docs/services/rekognition/projects_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: projects_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - projects_list_only
-  - rekognition
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>projects</code> in a region or regions, for all properties use <a href="/services/rekognition/projects/"><code>projects</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>projects_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Rekognition::Project type creates an Amazon Rekognition CustomLabels Project. A project is a grouping of the resources needed to create and manage Dataset and ProjectVersions.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rekognition.projects_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "project_name",
-    "type": "string",
-    "description": "The name of the project"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>projects</code> in a region.
-```sql
-SELECT
-region,
-project_name
-FROM awscc.rekognition.projects_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>projects_list_only</code> resource, see <a href="/services/rekognition/projects/#permissions"><code>projects</code></a>
-
diff --git a/website/docs/services/rekognition/stream_processors/index.md b/website/docs/services/rekognition/stream_processors/index.md
index d63874a39..05859c7c7 100644
--- a/website/docs/services/rekognition/stream_processors/index.md
+++ b/website/docs/services/rekognition/stream_processors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>stream_processor</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -218,6 +227,23 @@ Creates, updates, deletes or gets a <code>stream_processor</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Name of the stream processor. It's an identifier you assign to the stream processor. You can use it to manage the stream processor."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rekognition-streamprocessor.html"><code>AWS::Rekognition::StreamProcessor</code></a>.
 
@@ -227,31 +253,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>stream_processors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RoleArn, KinesisVideoStream, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>stream_processors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>stream_processors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>stream_processors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>stream_processors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -260,6 +292,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>stream_processor</code>.
 ```sql
 SELECT
@@ -283,6 +324,19 @@ tags
 FROM awscc.rekognition.stream_processors
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>stream_processors</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.rekognition.stream_processors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -412,6 +466,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rekognition.stream_processors
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rekognition/stream_processors_list_only/index.md b/website/docs/services/rekognition/stream_processors_list_only/index.md
deleted file mode 100644
index 73bcc73e5..000000000
--- a/website/docs/services/rekognition/stream_processors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: stream_processors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - stream_processors_list_only
-  - rekognition
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>stream_processors</code> in a region or regions, for all properties use <a href="/services/rekognition/stream_processors/"><code>stream_processors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>stream_processors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Rekognition::StreamProcessor type is used to create an Amazon Rekognition StreamProcessor that you can use to analyze streaming videos.<br /></td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rekognition.stream_processors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Name of the stream processor. It's an identifier you assign to the stream processor. You can use it to manage the stream processor."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>stream_processors</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.rekognition.stream_processors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>stream_processors_list_only</code> resource, see <a href="/services/rekognition/stream_processors/#permissions"><code>stream_processors</code></a>
-
diff --git a/website/docs/services/resiliencehub/apps/index.md b/website/docs/services/resiliencehub/apps/index.md
index 9328a1803..2c5c486a1 100644
--- a/website/docs/services/resiliencehub/apps/index.md
+++ b/website/docs/services/resiliencehub/apps/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>app</code> resource or lists <code>ap
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -183,6 +192,23 @@ Creates, updates, deletes or gets an <code>app</code> resource or lists <code>ap
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "app_arn",
+    "type": "string",
+    "description": "Amazon Resource Name (ARN) of the App."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-app.html"><code>AWS::ResilienceHub::App</code></a>.
 
@@ -192,31 +218,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>apps</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, AppTemplateBody, ResourceMappings, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>apps</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>apps</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>apps_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>apps</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -225,6 +257,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>app</code>.
 ```sql
 SELECT
@@ -243,6 +284,19 @@ drift_status
 FROM awscc.resiliencehub.apps
 WHERE region = 'us-east-1' AND data__Identifier = '<AppArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>apps</code> in a region.
+```sql
+SELECT
+region,
+app_arn
+FROM awscc.resiliencehub.apps_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -356,6 +410,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.resiliencehub.apps
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "ResiliencyPolicyArn": resiliency_policy_arn,
+    "Tags": tags,
+    "AppTemplateBody": app_template_body,
+    "ResourceMappings": resource_mappings,
+    "AppAssessmentSchedule": app_assessment_schedule,
+    "PermissionModel": permission_model,
+    "EventSubscriptions": event_subscriptions
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AppArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/resiliencehub/apps_list_only/index.md b/website/docs/services/resiliencehub/apps_list_only/index.md
deleted file mode 100644
index 1b9bb1711..000000000
--- a/website/docs/services/resiliencehub/apps_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: apps_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - apps_list_only
-  - resiliencehub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>apps</code> in a region or regions, for all properties use <a href="/services/resiliencehub/apps/"><code>apps</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>apps_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type Definition for AWS::ResilienceHub::App.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.resiliencehub.apps_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "app_arn",
-    "type": "string",
-    "description": "Amazon Resource Name (ARN) of the App."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>apps</code> in a region.
-```sql
-SELECT
-region,
-app_arn
-FROM awscc.resiliencehub.apps_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>apps_list_only</code> resource, see <a href="/services/resiliencehub/apps/#permissions"><code>apps</code></a>
-
diff --git a/website/docs/services/resiliencehub/index.md b/website/docs/services/resiliencehub/index.md
index 8d2ae1ebf..f736c958b 100644
--- a/website/docs/services/resiliencehub/index.md
+++ b/website/docs/services/resiliencehub/index.md
@@ -20,7 +20,7 @@ The resiliencehub service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The resiliencehub service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/resiliencehub/apps/">apps</a><br />
-<a href="/services/resiliencehub/apps_list_only/">apps_list_only</a>
+<a href="/services/resiliencehub/apps/">apps</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/resiliencehub/resiliency_policies/">resiliency_policies</a><br />
-<a href="/services/resiliencehub/resiliency_policies_list_only/">resiliency_policies_list_only</a>
+<a href="/services/resiliencehub/resiliency_policies/">resiliency_policies</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/resiliencehub/resiliency_policies/index.md b/website/docs/services/resiliencehub/resiliency_policies/index.md
index d00948cdc..ff5f00530 100644
--- a/website/docs/services/resiliencehub/resiliency_policies/index.md
+++ b/website/docs/services/resiliencehub/resiliency_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resiliency_policy</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "policy_name",
@@ -94,6 +103,47 @@ Creates, updates, deletes or gets a <code>resiliency_policy</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "policy",
+    "type": "object",
+    "description": "",
+    "children": [
+      {
+        "name": "az",
+        "type": "object",
+        "description": "Failure Policy.",
+        "children": [
+          {
+            "name": "rto_in_secs",
+            "type": "integer",
+            "description": "RTO in seconds."
+          },
+          {
+            "name": "rpo_in_secs",
+            "type": "integer",
+            "description": "RPO in seconds."
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "policy_arn",
+    "type": "string",
+    "description": "Amazon Resource Name (ARN) of the Resiliency Policy."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-resiliencypolicy.html"><code>AWS::ResilienceHub::ResiliencyPolicy</code></a>.
 
@@ -103,31 +153,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resiliency_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PolicyName, Tier, Policy, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resiliency_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resiliency_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resiliency_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resiliency_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +192,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resiliency_policy</code>.
 ```sql
 SELECT
@@ -150,6 +215,19 @@ tags
 FROM awscc.resiliencehub.resiliency_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<PolicyArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resiliency_policies</code> in a region.
+```sql
+SELECT
+region,
+policy_arn
+FROM awscc.resiliencehub.resiliency_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -240,6 +318,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.resiliencehub.resiliency_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyName": policy_name,
+    "PolicyDescription": policy_description,
+    "DataLocationConstraint": data_location_constraint,
+    "Tier": tier,
+    "Policy": policy,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PolicyArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/resiliencehub/resiliency_policies_list_only/index.md b/website/docs/services/resiliencehub/resiliency_policies_list_only/index.md
deleted file mode 100644
index 68b9235d2..000000000
--- a/website/docs/services/resiliencehub/resiliency_policies_list_only/index.md
+++ /dev/null
@@ -1,104 +0,0 @@
----
-title: resiliency_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resiliency_policies_list_only
-  - resiliencehub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resiliency_policies</code> in a region or regions, for all properties use <a href="/services/resiliencehub/resiliency_policies/"><code>resiliency_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resiliency_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type Definition for Resiliency Policy.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.resiliencehub.resiliency_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "policy",
-    "type": "object",
-    "description": "",
-    "children": [
-      {
-        "name": "az",
-        "type": "object",
-        "description": "Failure Policy.",
-        "children": [
-          {
-            "name": "rto_in_secs",
-            "type": "integer",
-            "description": "RTO in seconds."
-          },
-          {
-            "name": "rpo_in_secs",
-            "type": "integer",
-            "description": "RPO in seconds."
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "policy_arn",
-    "type": "string",
-    "description": "Amazon Resource Name (ARN) of the Resiliency Policy."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resiliency_policies</code> in a region.
-```sql
-SELECT
-region,
-policy_arn
-FROM awscc.resiliencehub.resiliency_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resiliency_policies_list_only</code> resource, see <a href="/services/resiliencehub/resiliency_policies/#permissions"><code>resiliency_policies</code></a>
-
diff --git a/website/docs/services/resourceexplorer2/default_view_associations/index.md b/website/docs/services/resourceexplorer2/default_view_associations/index.md
index d302d332c..d9890435a 100644
--- a/website/docs/services/resourceexplorer2/default_view_associations/index.md
+++ b/website/docs/services/resourceexplorer2/default_view_associations/index.md
@@ -156,6 +156,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.resourceexplorer2.default_view_associations
+SET data__PatchDocument = string('{{ {
+    "ViewArn": view_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AssociatedAwsPrincipal>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/resourceexplorer2/index.md b/website/docs/services/resourceexplorer2/index.md
index 5a23fdb78..42d52d651 100644
--- a/website/docs/services/resourceexplorer2/index.md
+++ b/website/docs/services/resourceexplorer2/index.md
@@ -20,7 +20,7 @@ The resourceexplorer2 service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>5</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,11 +30,9 @@ The resourceexplorer2 service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/resourceexplorer2/default_view_associations/">default_view_associations</a><br />
-<a href="/services/resourceexplorer2/indices/">indices</a><br />
-<a href="/services/resourceexplorer2/indices_list_only/">indices_list_only</a>
+<a href="/services/resourceexplorer2/indices/">indices</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/resourceexplorer2/views/">views</a><br />
-<a href="/services/resourceexplorer2/views_list_only/">views_list_only</a>
+<a href="/services/resourceexplorer2/views/">views</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/resourceexplorer2/indices/index.md b/website/docs/services/resourceexplorer2/indices/index.md
index 306c25a94..1a755beee 100644
--- a/website/docs/services/resourceexplorer2/indices/index.md
+++ b/website/docs/services/resourceexplorer2/indices/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>index</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets an <code>index</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resourceexplorer2-index.html"><code>AWS::ResourceExplorer2::Index</code></a>.
 
@@ -69,31 +95,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>indices_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>indices</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +134,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>index</code>.
 ```sql
 SELECT
@@ -113,6 +154,19 @@ index_state
 FROM awscc.resourceexplorer2.indices
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>indices</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.resourceexplorer2.indices_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -177,6 +231,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.resourceexplorer2.indices
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Type": type
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/resourceexplorer2/indices_list_only/index.md b/website/docs/services/resourceexplorer2/indices_list_only/index.md
deleted file mode 100644
index c7a126df2..000000000
--- a/website/docs/services/resourceexplorer2/indices_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: indices_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - indices_list_only
-  - resourceexplorer2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>indices</code> in a region or regions, for all properties use <a href="/services/resourceexplorer2/indices/"><code>indices</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>indices_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::ResourceExplorer2::Index Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.resourceexplorer2.indices_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>indices</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.resourceexplorer2.indices_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>indices_list_only</code> resource, see <a href="/services/resourceexplorer2/indices/#permissions"><code>indices</code></a>
-
diff --git a/website/docs/services/resourceexplorer2/views/index.md b/website/docs/services/resourceexplorer2/views/index.md
index ea18ff89e..d62c9dac4 100644
--- a/website/docs/services/resourceexplorer2/views/index.md
+++ b/website/docs/services/resourceexplorer2/views/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>view</code> resource or lists <code>vi
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "filters",
@@ -84,6 +93,23 @@ Creates, updates, deletes or gets a <code>view</code> resource or lists <code>vi
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "view_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resourceexplorer2-view.html"><code>AWS::ResourceExplorer2::View</code></a>.
 
@@ -93,31 +119,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>views</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ViewName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>views</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>views</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>views_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>views</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -126,6 +158,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>view</code>.
 ```sql
 SELECT
@@ -139,6 +180,19 @@ view_name
 FROM awscc.resourceexplorer2.views
 WHERE region = 'us-east-1' AND data__Identifier = '<ViewArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>views</code> in a region.
+```sql
+SELECT
+region,
+view_arn
+FROM awscc.resourceexplorer2.views_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +271,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.resourceexplorer2.views
+SET data__PatchDocument = string('{{ {
+    "Filters": filters,
+    "IncludedProperties": included_properties,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ViewArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/resourceexplorer2/views_list_only/index.md b/website/docs/services/resourceexplorer2/views_list_only/index.md
deleted file mode 100644
index b8f273724..000000000
--- a/website/docs/services/resourceexplorer2/views_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: views_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - views_list_only
-  - resourceexplorer2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>views</code> in a region or regions, for all properties use <a href="/services/resourceexplorer2/views/"><code>views</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>views_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::ResourceExplorer2::View Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.resourceexplorer2.views_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "view_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>views</code> in a region.
-```sql
-SELECT
-region,
-view_arn
-FROM awscc.resourceexplorer2.views_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>views_list_only</code> resource, see <a href="/services/resourceexplorer2/views/#permissions"><code>views</code></a>
-
diff --git a/website/docs/services/resourcegroups/groups/index.md b/website/docs/services/resourcegroups/groups/index.md
index 79b14f7dd..aa706538f 100644
--- a/website/docs/services/resourcegroups/groups/index.md
+++ b/website/docs/services/resourcegroups/groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>group</code> resource or lists <code>g
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -152,6 +161,23 @@ Creates, updates, deletes or gets a <code>group</code> resource or lists <code>g
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the resource group"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resourcegroups-group.html"><code>AWS::ResourceGroups::Group</code></a>.
 
@@ -161,31 +187,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -194,6 +226,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>group</code>.
 ```sql
 SELECT
@@ -208,6 +249,19 @@ resources
 FROM awscc.resourcegroups.groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>groups</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.resourcegroups.groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -305,6 +359,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.resourcegroups.groups
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "ResourceQuery": resource_query,
+    "Tags": tags,
+    "Configuration": configuration,
+    "Resources": resources
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/resourcegroups/groups_list_only/index.md b/website/docs/services/resourcegroups/groups_list_only/index.md
deleted file mode 100644
index a33490c80..000000000
--- a/website/docs/services/resourcegroups/groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - groups_list_only
-  - resourcegroups
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>groups</code> in a region or regions, for all properties use <a href="/services/resourcegroups/groups/"><code>groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Schema for ResourceGroups::Group</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.resourcegroups.groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the resource group"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>groups</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.resourcegroups.groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>groups_list_only</code> resource, see <a href="/services/resourcegroups/groups/#permissions"><code>groups</code></a>
-
diff --git a/website/docs/services/resourcegroups/index.md b/website/docs/services/resourcegroups/index.md
index 6339c5bd6..8661e673c 100644
--- a/website/docs/services/resourcegroups/index.md
+++ b/website/docs/services/resourcegroups/index.md
@@ -20,7 +20,7 @@ The resourcegroups service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The resourcegroups service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/resourcegroups/groups/">groups</a><br />
-<a href="/services/resourcegroups/groups_list_only/">groups_list_only</a>
+<a href="/services/resourcegroups/groups/">groups</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/resourcegroups/tag_sync_tasks/">tag_sync_tasks</a><br />
-<a href="/services/resourcegroups/tag_sync_tasks_list_only/">tag_sync_tasks_list_only</a>
+<a href="/services/resourcegroups/tag_sync_tasks/">tag_sync_tasks</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/resourcegroups/tag_sync_tasks/index.md b/website/docs/services/resourcegroups/tag_sync_tasks/index.md
index 764362a32..8ee8669c9 100644
--- a/website/docs/services/resourcegroups/tag_sync_tasks/index.md
+++ b/website/docs/services/resourcegroups/tag_sync_tasks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>tag_sync_task</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "group",
@@ -80,6 +89,23 @@ Creates, updates, deletes or gets a <code>tag_sync_task</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "task_arn",
+    "type": "string",
+    "description": "The ARN of the TagSyncTask resource"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resourcegroups-tagsynctask.html"><code>AWS::ResourceGroups::TagSyncTask</code></a>.
 
@@ -89,26 +115,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>tag_sync_tasks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Group, TagKey, TagValue, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>tag_sync_tasks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>tag_sync_tasks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>tag_sync_tasks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +148,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>tag_sync_task</code>.
 ```sql
 SELECT
@@ -132,6 +172,19 @@ status
 FROM awscc.resourcegroups.tag_sync_tasks
 WHERE region = 'us-east-1' AND data__Identifier = '<TaskArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>tag_sync_tasks</code> in a region.
+```sql
+SELECT
+region,
+task_arn
+FROM awscc.resourcegroups.tag_sync_tasks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -210,6 +263,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/resourcegroups/tag_sync_tasks_list_only/index.md b/website/docs/services/resourcegroups/tag_sync_tasks_list_only/index.md
deleted file mode 100644
index b8d656a79..000000000
--- a/website/docs/services/resourcegroups/tag_sync_tasks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: tag_sync_tasks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - tag_sync_tasks_list_only
-  - resourcegroups
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>tag_sync_tasks</code> in a region or regions, for all properties use <a href="/services/resourcegroups/tag_sync_tasks/"><code>tag_sync_tasks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>tag_sync_tasks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Schema for ResourceGroups::TagSyncTask</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.resourcegroups.tag_sync_tasks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "task_arn",
-    "type": "string",
-    "description": "The ARN of the TagSyncTask resource"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>tag_sync_tasks</code> in a region.
-```sql
-SELECT
-region,
-task_arn
-FROM awscc.resourcegroups.tag_sync_tasks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>tag_sync_tasks_list_only</code> resource, see <a href="/services/resourcegroups/tag_sync_tasks/#permissions"><code>tag_sync_tasks</code></a>
-
diff --git a/website/docs/services/robomaker/fleets/index.md b/website/docs/services/robomaker/fleets/index.md
index 89dfc80c7..f5d46eae3 100644
--- a/website/docs/services/robomaker/fleets/index.md
+++ b/website/docs/services/robomaker/fleets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>fleet</code> resource or lists <code>f
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets a <code>fleet</code> resource or lists <code>f
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-fleet.html"><code>AWS::RoboMaker::Fleet</code></a>.
 
@@ -64,31 +90,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>fleets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>fleets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +129,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>fleet</code>.
 ```sql
 SELECT
@@ -107,6 +148,19 @@ name
 FROM awscc.robomaker.fleets
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>fleets</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.robomaker.fleets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -171,6 +225,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.robomaker.fleets
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/robomaker/fleets_list_only/index.md b/website/docs/services/robomaker/fleets_list_only/index.md
deleted file mode 100644
index 61baf98e7..000000000
--- a/website/docs/services/robomaker/fleets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: fleets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - fleets_list_only
-  - robomaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>fleets</code> in a region or regions, for all properties use <a href="/services/robomaker/fleets/"><code>fleets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>fleets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::RoboMaker::Fleet resource creates an AWS RoboMaker fleet. Fleets contain robots and can receive deployments.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.robomaker.fleets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>fleets</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.robomaker.fleets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>fleets_list_only</code> resource, see <a href="/services/robomaker/fleets/#permissions"><code>fleets</code></a>
-
diff --git a/website/docs/services/robomaker/index.md b/website/docs/services/robomaker/index.md
index eae6bc0d8..d9f29d879 100644
--- a/website/docs/services/robomaker/index.md
+++ b/website/docs/services/robomaker/index.md
@@ -20,7 +20,7 @@ The robomaker service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>10</b></span><br />
+<span>total resources:&nbsp;<b>6</b></span><br />
 </div>
 </div>
 
@@ -30,16 +30,12 @@ The robomaker service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/robomaker/fleets/">fleets</a><br />
-<a href="/services/robomaker/fleets_list_only/">fleets_list_only</a><br />
 <a href="/services/robomaker/robot_application_versions/">robot_application_versions</a><br />
-<a href="/services/robomaker/robot_applications/">robot_applications</a><br />
-<a href="/services/robomaker/robot_applications_list_only/">robot_applications_list_only</a>
+<a href="/services/robomaker/robot_applications/">robot_applications</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/robomaker/robots/">robots</a><br />
-<a href="/services/robomaker/robots_list_only/">robots_list_only</a><br />
 <a href="/services/robomaker/simulation_application_versions/">simulation_application_versions</a><br />
-<a href="/services/robomaker/simulation_applications/">simulation_applications</a><br />
-<a href="/services/robomaker/simulation_applications_list_only/">simulation_applications_list_only</a>
+<a href="/services/robomaker/simulation_applications/">simulation_applications</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/robomaker/robot_application_versions/index.md b/website/docs/services/robomaker/robot_application_versions/index.md
index 8032f607b..7cd27fce2 100644
--- a/website/docs/services/robomaker/robot_application_versions/index.md
+++ b/website/docs/services/robomaker/robot_application_versions/index.md
@@ -162,6 +162,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/robomaker/robot_applications/index.md b/website/docs/services/robomaker/robot_applications/index.md
index b40948540..e40d1d656 100644
--- a/website/docs/services/robomaker/robot_applications/index.md
+++ b/website/docs/services/robomaker/robot_applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>robot_application</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -104,6 +113,23 @@ Creates, updates, deletes or gets a <code>robot_application</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robotapplication.html"><code>AWS::RoboMaker::RobotApplication</code></a>.
 
@@ -113,31 +139,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>robot_applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RobotSoftwareSuite, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>robot_applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>robot_applications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>robot_applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>robot_applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -146,6 +178,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>robot_application</code>.
 ```sql
 SELECT
@@ -160,6 +201,19 @@ tags
 FROM awscc.robomaker.robot_applications
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>robot_applications</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.robomaker.robot_applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -245,6 +299,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.robomaker.robot_applications
+SET data__PatchDocument = string('{{ {
+    "Sources": sources,
+    "Environment": environment,
+    "RobotSoftwareSuite": robot_software_suite,
+    "CurrentRevisionId": current_revision_id,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/robomaker/robot_applications_list_only/index.md b/website/docs/services/robomaker/robot_applications_list_only/index.md
deleted file mode 100644
index 433e0500f..000000000
--- a/website/docs/services/robomaker/robot_applications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: robot_applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - robot_applications_list_only
-  - robomaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>robot_applications</code> in a region or regions, for all properties use <a href="/services/robomaker/robot_applications/"><code>robot_applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>robot_applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This schema is for testing purpose only.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.robomaker.robot_applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>robot_applications</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.robomaker.robot_applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>robot_applications_list_only</code> resource, see <a href="/services/robomaker/robot_applications/#permissions"><code>robot_applications</code></a>
-
diff --git a/website/docs/services/robomaker/robots/index.md b/website/docs/services/robomaker/robots/index.md
index 1b0f16e21..7af8ea4dc 100644
--- a/website/docs/services/robomaker/robots/index.md
+++ b/website/docs/services/robomaker/robots/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>robot</code> resource or lists <code>r
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -70,6 +79,23 @@ Creates, updates, deletes or gets a <code>robot</code> resource or lists <code>r
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robot.html"><code>AWS::RoboMaker::Robot</code></a>.
 
@@ -79,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>robots</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GreengrassGroupId, Architecture, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>robots</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>robots</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>robots_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>robots</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>robot</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ name
 FROM awscc.robomaker.robots
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>robots</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.robomaker.robots_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -203,6 +257,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.robomaker.robots
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/robomaker/robots_list_only/index.md b/website/docs/services/robomaker/robots_list_only/index.md
deleted file mode 100644
index d62abd0f6..000000000
--- a/website/docs/services/robomaker/robots_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: robots_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - robots_list_only
-  - robomaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>robots</code> in a region or regions, for all properties use <a href="/services/robomaker/robots/"><code>robots</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>robots_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::RoboMaker::Robot resource creates an AWS RoboMaker Robot.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.robomaker.robots_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>robots</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.robomaker.robots_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>robots_list_only</code> resource, see <a href="/services/robomaker/robots/#permissions"><code>robots</code></a>
-
diff --git a/website/docs/services/robomaker/simulation_application_versions/index.md b/website/docs/services/robomaker/simulation_application_versions/index.md
index 72955ccbb..180dc43f2 100644
--- a/website/docs/services/robomaker/simulation_application_versions/index.md
+++ b/website/docs/services/robomaker/simulation_application_versions/index.md
@@ -162,6 +162,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/robomaker/simulation_applications/index.md b/website/docs/services/robomaker/simulation_applications/index.md
index cb16a654f..0337d662f 100644
--- a/website/docs/services/robomaker/simulation_applications/index.md
+++ b/website/docs/services/robomaker/simulation_applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>simulation_application</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -138,6 +147,23 @@ Creates, updates, deletes or gets a <code>simulation_application</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-simulationapplication.html"><code>AWS::RoboMaker::SimulationApplication</code></a>.
 
@@ -147,31 +173,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>simulation_applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RobotSoftwareSuite, SimulationSoftwareSuite, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>simulation_applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>simulation_applications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>simulation_applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>simulation_applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -180,6 +212,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>simulation_application</code>.
 ```sql
 SELECT
@@ -196,6 +237,19 @@ tags
 FROM awscc.robomaker.simulation_applications
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>simulation_applications</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.robomaker.simulation_applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -295,6 +349,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.robomaker.simulation_applications
+SET data__PatchDocument = string('{{ {
+    "CurrentRevisionId": current_revision_id,
+    "RenderingEngine": rendering_engine,
+    "RobotSoftwareSuite": robot_software_suite,
+    "SimulationSoftwareSuite": simulation_software_suite,
+    "Sources": sources,
+    "Environment": environment,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/robomaker/simulation_applications_list_only/index.md b/website/docs/services/robomaker/simulation_applications_list_only/index.md
deleted file mode 100644
index f3fe527ab..000000000
--- a/website/docs/services/robomaker/simulation_applications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: simulation_applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - simulation_applications_list_only
-  - robomaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>simulation_applications</code> in a region or regions, for all properties use <a href="/services/robomaker/simulation_applications/"><code>simulation_applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>simulation_applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This schema is for testing purpose only.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.robomaker.simulation_applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>simulation_applications</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.robomaker.simulation_applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>simulation_applications_list_only</code> resource, see <a href="/services/robomaker/simulation_applications/#permissions"><code>simulation_applications</code></a>
-
diff --git a/website/docs/services/rolesanywhere/crls/index.md b/website/docs/services/rolesanywhere/crls/index.md
index 6bc26b733..f08792f6b 100644
--- a/website/docs/services/rolesanywhere/crls/index.md
+++ b/website/docs/services/rolesanywhere/crls/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>crl</code> resource or lists <code>crl
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "crl_data",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>crl</code> resource or lists <code>crl
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "crl_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-crl.html"><code>AWS::RolesAnywhere::CRL</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>crls</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, CrlData, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>crls</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>crls</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>crls_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>crls</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>crl</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.rolesanywhere.crls
 WHERE region = 'us-east-1' AND data__Identifier = '<CrlId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>crls</code> in a region.
+```sql
+SELECT
+region,
+crl_id
+FROM awscc.rolesanywhere.crls_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +271,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rolesanywhere.crls
+SET data__PatchDocument = string('{{ {
+    "CrlData": crl_data,
+    "Enabled": enabled,
+    "Name": name,
+    "TrustAnchorArn": trust_anchor_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CrlId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rolesanywhere/crls_list_only/index.md b/website/docs/services/rolesanywhere/crls_list_only/index.md
deleted file mode 100644
index 25860c4a2..000000000
--- a/website/docs/services/rolesanywhere/crls_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: crls_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - crls_list_only
-  - rolesanywhere
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>crls</code> in a region or regions, for all properties use <a href="/services/rolesanywhere/crls/"><code>crls</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>crls_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::RolesAnywhere::CRL Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rolesanywhere.crls_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "crl_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>crls</code> in a region.
-```sql
-SELECT
-region,
-crl_id
-FROM awscc.rolesanywhere.crls_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>crls_list_only</code> resource, see <a href="/services/rolesanywhere/crls/#permissions"><code>crls</code></a>
-
diff --git a/website/docs/services/rolesanywhere/index.md b/website/docs/services/rolesanywhere/index.md
index b894d8d88..57bd13c87 100644
--- a/website/docs/services/rolesanywhere/index.md
+++ b/website/docs/services/rolesanywhere/index.md
@@ -20,7 +20,7 @@ The rolesanywhere service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The rolesanywhere service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/rolesanywhere/crls/">crls</a><br />
-<a href="/services/rolesanywhere/crls_list_only/">crls_list_only</a><br />
 <a href="/services/rolesanywhere/profiles/">profiles</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/rolesanywhere/profiles_list_only/">profiles_list_only</a><br />
-<a href="/services/rolesanywhere/trust_anchors/">trust_anchors</a><br />
-<a href="/services/rolesanywhere/trust_anchors_list_only/">trust_anchors_list_only</a>
+<a href="/services/rolesanywhere/trust_anchors/">trust_anchors</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/rolesanywhere/profiles/index.md b/website/docs/services/rolesanywhere/profiles/index.md
index f7d4e529b..26685a503 100644
--- a/website/docs/services/rolesanywhere/profiles/index.md
+++ b/website/docs/services/rolesanywhere/profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>profile</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "duration_seconds",
@@ -131,6 +140,23 @@ Creates, updates, deletes or gets a <code>profile</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "profile_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-profile.html"><code>AWS::RolesAnywhere::Profile</code></a>.
 
@@ -140,31 +166,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, RoleArns, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -173,6 +205,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>profile</code>.
 ```sql
 SELECT
@@ -192,6 +233,19 @@ accept_role_session_name
 FROM awscc.rolesanywhere.profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<ProfileId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>profiles</code> in a region.
+```sql
+SELECT
+region,
+profile_id
+FROM awscc.rolesanywhere.profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -297,6 +351,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rolesanywhere.profiles
+SET data__PatchDocument = string('{{ {
+    "DurationSeconds": duration_seconds,
+    "Enabled": enabled,
+    "ManagedPolicyArns": managed_policy_arns,
+    "Name": name,
+    "RoleArns": role_arns,
+    "SessionPolicy": session_policy,
+    "Tags": tags,
+    "AttributeMappings": attribute_mappings,
+    "AcceptRoleSessionName": accept_role_session_name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ProfileId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rolesanywhere/profiles_list_only/index.md b/website/docs/services/rolesanywhere/profiles_list_only/index.md
deleted file mode 100644
index e80ee2d8a..000000000
--- a/website/docs/services/rolesanywhere/profiles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - profiles_list_only
-  - rolesanywhere
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>profiles</code> in a region or regions, for all properties use <a href="/services/rolesanywhere/profiles/"><code>profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::RolesAnywhere::Profile Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rolesanywhere.profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "profile_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>profiles</code> in a region.
-```sql
-SELECT
-region,
-profile_id
-FROM awscc.rolesanywhere.profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>profiles_list_only</code> resource, see <a href="/services/rolesanywhere/profiles/#permissions"><code>profiles</code></a>
-
diff --git a/website/docs/services/rolesanywhere/trust_anchors/index.md b/website/docs/services/rolesanywhere/trust_anchors/index.md
index ac57eddb2..2d376ee48 100644
--- a/website/docs/services/rolesanywhere/trust_anchors/index.md
+++ b/website/docs/services/rolesanywhere/trust_anchors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>trust_anchor</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "enabled",
@@ -121,6 +130,23 @@ Creates, updates, deletes or gets a <code>trust_anchor</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "trust_anchor_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-trustanchor.html"><code>AWS::RolesAnywhere::TrustAnchor</code></a>.
 
@@ -130,31 +156,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>trust_anchors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Source, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>trust_anchors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>trust_anchors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>trust_anchors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>trust_anchors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -163,6 +195,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>trust_anchor</code>.
 ```sql
 SELECT
@@ -177,6 +218,19 @@ trust_anchor_arn
 FROM awscc.rolesanywhere.trust_anchors
 WHERE region = 'us-east-1' AND data__Identifier = '<TrustAnchorId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>trust_anchors</code> in a region.
+```sql
+SELECT
+region,
+trust_anchor_id
+FROM awscc.rolesanywhere.trust_anchors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -263,6 +317,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rolesanywhere.trust_anchors
+SET data__PatchDocument = string('{{ {
+    "Enabled": enabled,
+    "Name": name,
+    "NotificationSettings": notification_settings,
+    "Source": source,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TrustAnchorId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rolesanywhere/trust_anchors_list_only/index.md b/website/docs/services/rolesanywhere/trust_anchors_list_only/index.md
deleted file mode 100644
index 1f6b690fa..000000000
--- a/website/docs/services/rolesanywhere/trust_anchors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: trust_anchors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - trust_anchors_list_only
-  - rolesanywhere
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>trust_anchors</code> in a region or regions, for all properties use <a href="/services/rolesanywhere/trust_anchors/"><code>trust_anchors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>trust_anchors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::RolesAnywhere::TrustAnchor Resource Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rolesanywhere.trust_anchors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "trust_anchor_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>trust_anchors</code> in a region.
-```sql
-SELECT
-region,
-trust_anchor_id
-FROM awscc.rolesanywhere.trust_anchors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>trust_anchors_list_only</code> resource, see <a href="/services/rolesanywhere/trust_anchors/#permissions"><code>trust_anchors</code></a>
-
diff --git a/website/docs/services/route53/cidr_collections/index.md b/website/docs/services/route53/cidr_collections/index.md
index 0b6765295..9b2411d43 100644
--- a/website/docs/services/route53/cidr_collections/index.md
+++ b/website/docs/services/route53/cidr_collections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cidr_collection</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>cidr_collection</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "UUID of the CIDR collection."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-cidrcollection.html"><code>AWS::Route53::CidrCollection</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cidr_collections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cidr_collections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cidr_collections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cidr_collections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cidr_collections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cidr_collection</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ locations
 FROM awscc.route53.cidr_collections
 WHERE data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cidr_collections</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.route53.cidr_collections_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -192,6 +246,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53.cidr_collections
+SET data__PatchDocument = string('{{ {
+    "Locations": locations
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53/cidr_collections_list_only/index.md b/website/docs/services/route53/cidr_collections_list_only/index.md
deleted file mode 100644
index 38f7be9e4..000000000
--- a/website/docs/services/route53/cidr_collections_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: cidr_collections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cidr_collections_list_only
-  - route53
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cidr_collections</code> in a region or regions, for all properties use <a href="/services/route53/cidr_collections/"><code>cidr_collections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cidr_collections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Route53::CidrCollection.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53.cidr_collections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "UUID of the CIDR collection."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cidr_collections</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.route53.cidr_collections_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cidr_collections_list_only</code> resource, see <a href="/services/route53/cidr_collections/#permissions"><code>cidr_collections</code></a>
-
diff --git a/website/docs/services/route53/dnssecs/index.md b/website/docs/services/route53/dnssecs/index.md
index 4b0025b55..e8d626b9d 100644
--- a/website/docs/services/route53/dnssecs/index.md
+++ b/website/docs/services/route53/dnssecs/index.md
@@ -33,6 +33,30 @@ Creates, updates, deletes or gets a <code>dnssec</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "hosted_zone_id",
+    "type": "string",
+    "description": "The unique string (ID) used to identify a hosted zone."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "hosted_zone_id",
@@ -45,6 +69,8 @@ Creates, updates, deletes or gets a <code>dnssec</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-dnssec.html"><code>AWS::Route53::DNSSEC</code></a>.
 
@@ -54,26 +80,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>dnssecs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="HostedZoneId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>dnssecs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>dnssecs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>dnssecs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -82,6 +113,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dnssec</code>.
 ```sql
 SELECT
@@ -90,6 +130,19 @@ hosted_zone_id
 FROM awscc.route53.dnssecs
 WHERE data__Identifier = '<HostedZoneId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>dnssecs</code> in a region.
+```sql
+SELECT
+region,
+hosted_zone_id
+FROM awscc.route53.dnssecs_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -150,6 +203,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53/dnssecs_list_only/index.md b/website/docs/services/route53/dnssecs_list_only/index.md
deleted file mode 100644
index 1a3c19904..000000000
--- a/website/docs/services/route53/dnssecs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: dnssecs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - dnssecs_list_only
-  - route53
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>dnssecs</code> in a region or regions, for all properties use <a href="/services/route53/dnssecs/"><code>dnssecs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>dnssecs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource used to control (enable/disable) DNSSEC in a specific hosted zone.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53.dnssecs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "hosted_zone_id",
-    "type": "string",
-    "description": "The unique string (ID) used to identify a hosted zone."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>dnssecs</code> in a region.
-```sql
-SELECT
-region,
-hosted_zone_id
-FROM awscc.route53.dnssecs_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>dnssecs_list_only</code> resource, see <a href="/services/route53/dnssecs/#permissions"><code>dnssecs</code></a>
-
diff --git a/website/docs/services/route53/health_checks/index.md b/website/docs/services/route53/health_checks/index.md
index 884d38291..b8e692be9 100644
--- a/website/docs/services/route53/health_checks/index.md
+++ b/website/docs/services/route53/health_checks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>health_check</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "health_check_id",
@@ -166,6 +175,23 @@ Creates, updates, deletes or gets a <code>health_check</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "health_check_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-healthcheck.html"><code>AWS::Route53::HealthCheck</code></a>.
 
@@ -175,31 +201,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>health_checks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="HealthCheckConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>health_checks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>health_checks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>health_checks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>health_checks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -208,6 +240,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>health_check</code>.
 ```sql
 SELECT
@@ -218,6 +259,19 @@ health_check_tags
 FROM awscc.route53.health_checks
 WHERE data__Identifier = '<HealthCheckId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>health_checks</code> in a region.
+```sql
+SELECT
+region,
+health_check_id
+FROM awscc.route53.health_checks_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -305,6 +359,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53.health_checks
+SET data__PatchDocument = string('{{ {
+    "HealthCheckTags": health_check_tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<HealthCheckId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53/health_checks_list_only/index.md b/website/docs/services/route53/health_checks_list_only/index.md
deleted file mode 100644
index ac85f5818..000000000
--- a/website/docs/services/route53/health_checks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: health_checks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - health_checks_list_only
-  - route53
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>health_checks</code> in a region or regions, for all properties use <a href="/services/route53/health_checks/"><code>health_checks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>health_checks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Route53::HealthCheck.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53.health_checks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "health_check_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>health_checks</code> in a region.
-```sql
-SELECT
-region,
-health_check_id
-FROM awscc.route53.health_checks_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>health_checks_list_only</code> resource, see <a href="/services/route53/health_checks/#permissions"><code>health_checks</code></a>
-
diff --git a/website/docs/services/route53/hosted_zones/index.md b/website/docs/services/route53/hosted_zones/index.md
index bc4f13a40..fe57640d1 100644
--- a/website/docs/services/route53/hosted_zones/index.md
+++ b/website/docs/services/route53/hosted_zones/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>hosted_zone</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "hosted_zone_tags",
@@ -113,6 +122,23 @@ Creates, updates, deletes or gets a <code>hosted_zone</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html"><code>AWS::Route53::HostedZone</code></a>.
 
@@ -122,31 +148,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>hosted_zones</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>hosted_zones</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>hosted_zones</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>hosted_zones_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>hosted_zones</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -155,6 +187,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>hosted_zone</code>.
 ```sql
 SELECT
@@ -169,6 +210,19 @@ name
 FROM awscc.route53.hosted_zones
 WHERE data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>hosted_zones</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.route53.hosted_zones_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -259,6 +313,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53.hosted_zones
+SET data__PatchDocument = string('{{ {
+    "HostedZoneTags": hosted_zone_tags,
+    "VPCs": vpcs,
+    "HostedZoneConfig": hosted_zone_config,
+    "QueryLoggingConfig": query_logging_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53/hosted_zones_list_only/index.md b/website/docs/services/route53/hosted_zones_list_only/index.md
deleted file mode 100644
index 73db46cfa..000000000
--- a/website/docs/services/route53/hosted_zones_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: hosted_zones_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - hosted_zones_list_only
-  - route53
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>hosted_zones</code> in a region or regions, for all properties use <a href="/services/route53/hosted_zones/"><code>hosted_zones</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>hosted_zones_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a new public or private hosted zone. You create records in a public hosted zone to define how you want to route traffic on the internet for a domain, such as example.com, and its subdomains (apex.example.com, acme.example.com). You create records in a private hosted zone to define how you want to route traffic for a domain and its subdomains within one or more Amazon Virtual Private Clouds (Amazon VPCs). <br />You can't convert a public hosted zone to a private hosted zone or vice versa. Instead, you must create a new hosted zone with the same name and create new resource record sets.<br />For more information about charges for hosted zones, see &#91;Amazon Route 53 Pricing&#93;(https://docs.aws.amazon.com/route53/pricing/).<br />Note the following:<br />+ You can't create a hosted zone for a top-level domain (TLD) such as .com.<br />+ If your domain is registered with a registrar other than Route 53, you must update the name servers with your registrar to make Route 53 the DNS service for the domain. For more information, see &#91;Migrating DNS Service for an Existing Domain to Amazon Route 53&#93;(https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/MigratingDNS.html) in the &#42;Amazon Route 53 Developer Guide&#42;. <br /><br />When you submit a &#96;&#96;CreateHostedZone&#96;&#96; request, the initial status of the hosted zone is &#96;&#96;PENDING&#96;&#96;. For public hosted zones, this means that the NS and SOA records are not yet available on all Route 53 DNS servers. When the NS and SOA records are available, the status of the zone changes to &#96;&#96;INSYNC&#96;&#96;.<br />The &#96;&#96;CreateHostedZone&#96;&#96; request requires the caller to have an &#96;&#96;ec2:DescribeVpcs&#96;&#96; permission.<br />When creating private hosted zones, the Amazon VPC must belong to the same partition where the hosted zone is created. A partition is a group of AWS-Regions. Each AWS-account is scoped to one partition.<br />The following are the supported partitions:<br />+ &#96;&#96;aws&#96;&#96; - AWS-Regions<br />+ &#96;&#96;aws-cn&#96;&#96; - China Regions<br />+ &#96;&#96;aws-us-gov&#96;&#96; - govcloud-us-region<br /><br />For more information, see &#91;Access Management&#93;(https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html) in the &#42;General Reference&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53.hosted_zones_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>hosted_zones</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.route53.hosted_zones_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>hosted_zones_list_only</code> resource, see <a href="/services/route53/hosted_zones/#permissions"><code>hosted_zones</code></a>
-
diff --git a/website/docs/services/route53/index.md b/website/docs/services/route53/index.md
index 01e7e919f..405c13f17 100644
--- a/website/docs/services/route53/index.md
+++ b/website/docs/services/route53/index.md
@@ -20,7 +20,7 @@ The route53 service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>10</b></span><br />
+<span>total resources:&nbsp;<b>5</b></span><br />
 </div>
 </div>
 
@@ -30,16 +30,11 @@ The route53 service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/route53/cidr_collections/">cidr_collections</a><br />
-<a href="/services/route53/cidr_collections_list_only/">cidr_collections_list_only</a><br />
 <a href="/services/route53/dnssecs/">dnssecs</a><br />
-<a href="/services/route53/dnssecs_list_only/">dnssecs_list_only</a><br />
 <a href="/services/route53/health_checks/">health_checks</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/route53/health_checks_list_only/">health_checks_list_only</a><br />
 <a href="/services/route53/hosted_zones/">hosted_zones</a><br />
-<a href="/services/route53/hosted_zones_list_only/">hosted_zones_list_only</a><br />
-<a href="/services/route53/key_signing_keys/">key_signing_keys</a><br />
-<a href="/services/route53/key_signing_keys_list_only/">key_signing_keys_list_only</a>
+<a href="/services/route53/key_signing_keys/">key_signing_keys</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/route53/key_signing_keys/index.md b/website/docs/services/route53/key_signing_keys/index.md
index f3c513284..bb2f908f3 100644
--- a/website/docs/services/route53/key_signing_keys/index.md
+++ b/website/docs/services/route53/key_signing_keys/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>key_signing_key</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "hosted_zone_id",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets a <code>key_signing_key</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "hosted_zone_id",
+    "type": "string",
+    "description": "The unique string (ID) used to identify a hosted zone."
+  },
+  {
+    "name": "name",
+    "type": "string",
+    "description": "An alphanumeric string used to identify a key signing key (KSK). Name must be unique for each key signing key in the same hosted zone."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-keysigningkey.html"><code>AWS::Route53::KeySigningKey</code></a>.
 
@@ -69,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>key_signing_keys</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Status, HostedZoneId, Name, KeyManagementServiceArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>key_signing_keys</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>key_signing_keys</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>key_signing_keys_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>key_signing_keys</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>key_signing_key</code>.
 ```sql
 SELECT
@@ -113,6 +159,20 @@ key_management_service_arn
 FROM awscc.route53.key_signing_keys
 WHERE data__Identifier = '<HostedZoneId>|<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>key_signing_keys</code> in a region.
+```sql
+SELECT
+region,
+hosted_zone_id,
+name
+FROM awscc.route53.key_signing_keys_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -191,6 +251,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53.key_signing_keys
+SET data__PatchDocument = string('{{ {
+    "Status": status
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<HostedZoneId>|<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53/key_signing_keys_list_only/index.md b/website/docs/services/route53/key_signing_keys_list_only/index.md
deleted file mode 100644
index 8d6a7f64c..000000000
--- a/website/docs/services/route53/key_signing_keys_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: key_signing_keys_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - key_signing_keys_list_only
-  - route53
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>key_signing_keys</code> in a region or regions, for all properties use <a href="/services/route53/key_signing_keys/"><code>key_signing_keys</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>key_signing_keys_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a key signing key (KSK) associated with a hosted zone. You can only have two KSKs per hosted zone.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53.key_signing_keys_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "hosted_zone_id",
-    "type": "string",
-    "description": "The unique string (ID) used to identify a hosted zone."
-  },
-  {
-    "name": "name",
-    "type": "string",
-    "description": "An alphanumeric string used to identify a key signing key (KSK). Name must be unique for each key signing key in the same hosted zone."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>key_signing_keys</code> in a region.
-```sql
-SELECT
-region,
-hosted_zone_id,
-name
-FROM awscc.route53.key_signing_keys_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>key_signing_keys_list_only</code> resource, see <a href="/services/route53/key_signing_keys/#permissions"><code>key_signing_keys</code></a>
-
diff --git a/website/docs/services/route53profiles/index.md b/website/docs/services/route53profiles/index.md
index 3d9a8245b..44291a5b5 100644
--- a/website/docs/services/route53profiles/index.md
+++ b/website/docs/services/route53profiles/index.md
@@ -20,7 +20,7 @@ The route53profiles service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The route53profiles service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/route53profiles/profile_associations/">profile_associations</a><br />
-<a href="/services/route53profiles/profile_associations_list_only/">profile_associations_list_only</a><br />
 <a href="/services/route53profiles/profile_resource_associations/">profile_resource_associations</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/route53profiles/profile_resource_associations_list_only/">profile_resource_associations_list_only</a><br />
-<a href="/services/route53profiles/profiles/">profiles</a><br />
-<a href="/services/route53profiles/profiles_list_only/">profiles_list_only</a>
+<a href="/services/route53profiles/profiles/">profiles</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/route53profiles/profile_associations/index.md b/website/docs/services/route53profiles/profile_associations/index.md
index 3088d5b15..f8638e5d5 100644
--- a/website/docs/services/route53profiles/profile_associations/index.md
+++ b/website/docs/services/route53profiles/profile_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>profile_association</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "resource_id",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>profile_association</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Primary Identifier for Profile Association"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53profiles-profileassociation.html"><code>AWS::Route53Profiles::ProfileAssociation</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>profile_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResourceId, ProfileId, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>profile_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>profile_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>profile_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>profile_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>profile_association</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ arn
 FROM awscc.route53profiles.profile_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>profile_associations</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.route53profiles.profile_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53profiles.profile_associations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "Arn": arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53profiles/profile_associations_list_only/index.md b/website/docs/services/route53profiles/profile_associations_list_only/index.md
deleted file mode 100644
index 9c7be8478..000000000
--- a/website/docs/services/route53profiles/profile_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: profile_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - profile_associations_list_only
-  - route53profiles
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>profile_associations</code> in a region or regions, for all properties use <a href="/services/route53profiles/profile_associations/"><code>profile_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>profile_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Route53Profiles::ProfileAssociation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53profiles.profile_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Primary Identifier for Profile Association"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>profile_associations</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.route53profiles.profile_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>profile_associations_list_only</code> resource, see <a href="/services/route53profiles/profile_associations/#permissions"><code>profile_associations</code></a>
-
diff --git a/website/docs/services/route53profiles/profile_resource_associations/index.md b/website/docs/services/route53profiles/profile_resource_associations/index.md
index 1027b9bd6..85a36e9a1 100644
--- a/website/docs/services/route53profiles/profile_resource_associations/index.md
+++ b/website/docs/services/route53profiles/profile_resource_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>profile_resource_association</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "profile_id",
@@ -70,6 +79,23 @@ Creates, updates, deletes or gets a <code>profile_resource_association</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Primary Identifier for Profile Resource Association"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53profiles-profileresourceassociation.html"><code>AWS::Route53Profiles::ProfileResourceAssociation</code></a>.
 
@@ -79,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>profile_resource_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ProfileId, Name, ResourceArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>profile_resource_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>profile_resource_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>profile_resource_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>profile_resource_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>profile_resource_association</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ resource_type
 FROM awscc.route53profiles.profile_resource_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>profile_resource_associations</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.route53profiles.profile_resource_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -201,6 +255,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53profiles.profile_resource_associations
+SET data__PatchDocument = string('{{ {
+    "ResourceProperties": resource_properties
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53profiles/profile_resource_associations_list_only/index.md b/website/docs/services/route53profiles/profile_resource_associations_list_only/index.md
deleted file mode 100644
index 3e2562ebb..000000000
--- a/website/docs/services/route53profiles/profile_resource_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: profile_resource_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - profile_resource_associations_list_only
-  - route53profiles
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>profile_resource_associations</code> in a region or regions, for all properties use <a href="/services/route53profiles/profile_resource_associations/"><code>profile_resource_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>profile_resource_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Route53Profiles::ProfileResourceAssociation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53profiles.profile_resource_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Primary Identifier for Profile Resource Association"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>profile_resource_associations</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.route53profiles.profile_resource_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>profile_resource_associations_list_only</code> resource, see <a href="/services/route53profiles/profile_resource_associations/#permissions"><code>profile_resource_associations</code></a>
-
diff --git a/website/docs/services/route53profiles/profiles/index.md b/website/docs/services/route53profiles/profiles/index.md
index b29d555e2..739d40ab1 100644
--- a/website/docs/services/route53profiles/profiles/index.md
+++ b/website/docs/services/route53profiles/profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>profile</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>profile</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the profile."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53profiles-profile.html"><code>AWS::Route53Profiles::Profile</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>profile</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ id
 FROM awscc.route53profiles.profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>profiles</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.route53profiles.profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -197,6 +251,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53profiles.profiles
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53profiles/profiles_list_only/index.md b/website/docs/services/route53profiles/profiles_list_only/index.md
deleted file mode 100644
index e120ffe89..000000000
--- a/website/docs/services/route53profiles/profiles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - profiles_list_only
-  - route53profiles
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>profiles</code> in a region or regions, for all properties use <a href="/services/route53profiles/profiles/"><code>profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Route53Profiles::Profile</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53profiles.profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the profile."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>profiles</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.route53profiles.profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>profiles_list_only</code> resource, see <a href="/services/route53profiles/profiles/#permissions"><code>profiles</code></a>
-
diff --git a/website/docs/services/route53recoverycontrol/clusters/index.md b/website/docs/services/route53recoverycontrol/clusters/index.md
index 984429f52..5aa645635 100644
--- a/website/docs/services/route53recoverycontrol/clusters/index.md
+++ b/website/docs/services/route53recoverycontrol/clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the cluster."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-cluster.html"><code>AWS::Route53RecoveryControl::Cluster</code></a>.
 
@@ -103,31 +129,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cluster</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ network_type
 FROM awscc.route53recoverycontrol.clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<ClusterArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>clusters</code> in a region.
+```sql
+SELECT
+region,
+cluster_arn
+FROM awscc.route53recoverycontrol.clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53recoverycontrol.clusters
+SET data__PatchDocument = string('{{ {
+    "NetworkType": network_type
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ClusterArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53recoverycontrol/clusters_list_only/index.md b/website/docs/services/route53recoverycontrol/clusters_list_only/index.md
deleted file mode 100644
index 8b1da068a..000000000
--- a/website/docs/services/route53recoverycontrol/clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - clusters_list_only
-  - route53recoverycontrol
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>clusters</code> in a region or regions, for all properties use <a href="/services/route53recoverycontrol/clusters/"><code>clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS Route53 Recovery Control Cluster resource schema</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53recoverycontrol.clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cluster_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the cluster."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>clusters</code> in a region.
-```sql
-SELECT
-region,
-cluster_arn
-FROM awscc.route53recoverycontrol.clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>clusters_list_only</code> resource, see <a href="/services/route53recoverycontrol/clusters/#permissions"><code>clusters</code></a>
-
diff --git a/website/docs/services/route53recoverycontrol/control_panels/index.md b/website/docs/services/route53recoverycontrol/control_panels/index.md
index 7c1e79e26..f74971124 100644
--- a/website/docs/services/route53recoverycontrol/control_panels/index.md
+++ b/website/docs/services/route53recoverycontrol/control_panels/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>control_panel</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cluster_arn",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>control_panel</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "control_panel_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the cluster."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-controlpanel.html"><code>AWS::Route53RecoveryControl::ControlPanel</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>control_panels</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>control_panels</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>control_panels</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>control_panels_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>control_panels</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>control_panel</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.route53recoverycontrol.control_panels
 WHERE region = 'us-east-1' AND data__Identifier = '<ControlPanelArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>control_panels</code> in a region.
+```sql
+SELECT
+region,
+control_panel_arn
+FROM awscc.route53recoverycontrol.control_panels_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -213,6 +267,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53recoverycontrol.control_panels
+SET data__PatchDocument = string('{{ {
+    "Name": name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ControlPanelArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53recoverycontrol/control_panels_list_only/index.md b/website/docs/services/route53recoverycontrol/control_panels_list_only/index.md
deleted file mode 100644
index db8236f7a..000000000
--- a/website/docs/services/route53recoverycontrol/control_panels_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: control_panels_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - control_panels_list_only
-  - route53recoverycontrol
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>control_panels</code> in a region or regions, for all properties use <a href="/services/route53recoverycontrol/control_panels/"><code>control_panels</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>control_panels_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS Route53 Recovery Control Control Panel resource schema .</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53recoverycontrol.control_panels_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "control_panel_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the cluster."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>control_panels</code> in a region.
-```sql
-SELECT
-region,
-control_panel_arn
-FROM awscc.route53recoverycontrol.control_panels_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>control_panels_list_only</code> resource, see <a href="/services/route53recoverycontrol/control_panels/#permissions"><code>control_panels</code></a>
-
diff --git a/website/docs/services/route53recoverycontrol/index.md b/website/docs/services/route53recoverycontrol/index.md
index f68ba1a16..7877224de 100644
--- a/website/docs/services/route53recoverycontrol/index.md
+++ b/website/docs/services/route53recoverycontrol/index.md
@@ -20,7 +20,7 @@ The route53recoverycontrol service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The route53recoverycontrol service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/route53recoverycontrol/clusters/">clusters</a><br />
-<a href="/services/route53recoverycontrol/clusters_list_only/">clusters_list_only</a><br />
-<a href="/services/route53recoverycontrol/control_panels/">control_panels</a><br />
-<a href="/services/route53recoverycontrol/control_panels_list_only/">control_panels_list_only</a>
+<a href="/services/route53recoverycontrol/control_panels/">control_panels</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/route53recoverycontrol/routing_controls/">routing_controls</a><br />
-<a href="/services/route53recoverycontrol/routing_controls_list_only/">routing_controls_list_only</a><br />
-<a href="/services/route53recoverycontrol/safety_rules/">safety_rules</a><br />
-<a href="/services/route53recoverycontrol/safety_rules_list_only/">safety_rules_list_only</a>
+<a href="/services/route53recoverycontrol/safety_rules/">safety_rules</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/route53recoverycontrol/routing_controls/index.md b/website/docs/services/route53recoverycontrol/routing_controls/index.md
index 8c49863a4..76e46a207 100644
--- a/website/docs/services/route53recoverycontrol/routing_controls/index.md
+++ b/website/docs/services/route53recoverycontrol/routing_controls/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>routing_control</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "routing_control_arn",
@@ -65,6 +74,23 @@ Creates, updates, deletes or gets a <code>routing_control</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "routing_control_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the routing control."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-routingcontrol.html"><code>AWS::Route53RecoveryControl::RoutingControl</code></a>.
 
@@ -74,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>routing_controls</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>routing_controls</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>routing_controls</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>routing_controls_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>routing_controls</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>routing_control</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ cluster_arn
 FROM awscc.route53recoverycontrol.routing_controls
 WHERE region = 'us-east-1' AND data__Identifier = '<RoutingControlArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>routing_controls</code> in a region.
+```sql
+SELECT
+region,
+routing_control_arn
+FROM awscc.route53recoverycontrol.routing_controls_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -187,6 +241,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53recoverycontrol.routing_controls
+SET data__PatchDocument = string('{{ {
+    "Name": name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RoutingControlArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53recoverycontrol/routing_controls_list_only/index.md b/website/docs/services/route53recoverycontrol/routing_controls_list_only/index.md
deleted file mode 100644
index e5290ac6c..000000000
--- a/website/docs/services/route53recoverycontrol/routing_controls_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: routing_controls_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - routing_controls_list_only
-  - route53recoverycontrol
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>routing_controls</code> in a region or regions, for all properties use <a href="/services/route53recoverycontrol/routing_controls/"><code>routing_controls</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>routing_controls_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS Route53 Recovery Control Routing Control resource schema .</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53recoverycontrol.routing_controls_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "routing_control_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the routing control."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>routing_controls</code> in a region.
-```sql
-SELECT
-region,
-routing_control_arn
-FROM awscc.route53recoverycontrol.routing_controls_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>routing_controls_list_only</code> resource, see <a href="/services/route53recoverycontrol/routing_controls/#permissions"><code>routing_controls</code></a>
-
diff --git a/website/docs/services/route53recoverycontrol/safety_rules/index.md b/website/docs/services/route53recoverycontrol/safety_rules/index.md
index dbbf9e863..235852640 100644
--- a/website/docs/services/route53recoverycontrol/safety_rules/index.md
+++ b/website/docs/services/route53recoverycontrol/safety_rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>safety_rule</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "assertion_rule",
@@ -138,6 +147,23 @@ Creates, updates, deletes or gets a <code>safety_rule</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "safety_rule_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the safety rule."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-safetyrule.html"><code>AWS::Route53RecoveryControl::SafetyRule</code></a>.
 
@@ -147,31 +173,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>safety_rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>safety_rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>safety_rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>safety_rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>safety_rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -180,6 +212,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>safety_rule</code>.
 ```sql
 SELECT
@@ -195,6 +236,19 @@ tags
 FROM awscc.route53recoverycontrol.safety_rules
 WHERE region = 'us-east-1' AND data__Identifier = '<SafetyRuleArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>safety_rules</code> in a region.
+```sql
+SELECT
+region,
+safety_rule_arn
+FROM awscc.route53recoverycontrol.safety_rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -288,6 +342,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53recoverycontrol.safety_rules
+SET data__PatchDocument = string('{{ {
+    "AssertionRule": assertion_rule,
+    "GatingRule": gating_rule,
+    "Name": name,
+    "ControlPanelArn": control_panel_arn,
+    "RuleConfig": rule_config,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SafetyRuleArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53recoverycontrol/safety_rules_list_only/index.md b/website/docs/services/route53recoverycontrol/safety_rules_list_only/index.md
deleted file mode 100644
index 94b521083..000000000
--- a/website/docs/services/route53recoverycontrol/safety_rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: safety_rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - safety_rules_list_only
-  - route53recoverycontrol
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>safety_rules</code> in a region or regions, for all properties use <a href="/services/route53recoverycontrol/safety_rules/"><code>safety_rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>safety_rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS Route53 Recovery Control basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53recoverycontrol.safety_rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "safety_rule_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the safety rule."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>safety_rules</code> in a region.
-```sql
-SELECT
-region,
-safety_rule_arn
-FROM awscc.route53recoverycontrol.safety_rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>safety_rules_list_only</code> resource, see <a href="/services/route53recoverycontrol/safety_rules/#permissions"><code>safety_rules</code></a>
-
diff --git a/website/docs/services/route53recoveryreadiness/cells/index.md b/website/docs/services/route53recoveryreadiness/cells/index.md
index 367e7e035..cc4ce14b2 100644
--- a/website/docs/services/route53recoveryreadiness/cells/index.md
+++ b/website/docs/services/route53recoveryreadiness/cells/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cell</code> resource or lists <code>ce
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cell_name",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>cell</code> resource or lists <code>ce
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cell_name",
+    "type": "string",
+    "description": "The name of the cell to create."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-cell.html"><code>AWS::Route53RecoveryReadiness::Cell</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>cells</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>cells</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>cells</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>cells_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>cells</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cell</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.route53recoveryreadiness.cells
 WHERE region = 'us-east-1' AND data__Identifier = '<CellName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>cells</code> in a region.
+```sql
+SELECT
+region,
+cell_name
+FROM awscc.route53recoveryreadiness.cells_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -206,6 +260,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53recoveryreadiness.cells
+SET data__PatchDocument = string('{{ {
+    "Cells": cells,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CellName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53recoveryreadiness/cells_list_only/index.md b/website/docs/services/route53recoveryreadiness/cells_list_only/index.md
deleted file mode 100644
index 4989ea6c5..000000000
--- a/website/docs/services/route53recoveryreadiness/cells_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: cells_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - cells_list_only
-  - route53recoveryreadiness
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>cells</code> in a region or regions, for all properties use <a href="/services/route53recoveryreadiness/cells/"><code>cells</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>cells_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The API Schema for AWS Route53 Recovery Readiness Cells.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53recoveryreadiness.cells_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cell_name",
-    "type": "string",
-    "description": "The name of the cell to create."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>cells</code> in a region.
-```sql
-SELECT
-region,
-cell_name
-FROM awscc.route53recoveryreadiness.cells_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>cells_list_only</code> resource, see <a href="/services/route53recoveryreadiness/cells/#permissions"><code>cells</code></a>
-
diff --git a/website/docs/services/route53recoveryreadiness/index.md b/website/docs/services/route53recoveryreadiness/index.md
index 472f7293d..1aec2b59d 100644
--- a/website/docs/services/route53recoveryreadiness/index.md
+++ b/website/docs/services/route53recoveryreadiness/index.md
@@ -20,7 +20,7 @@ The route53recoveryreadiness service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The route53recoveryreadiness service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/route53recoveryreadiness/cells/">cells</a><br />
-<a href="/services/route53recoveryreadiness/cells_list_only/">cells_list_only</a><br />
-<a href="/services/route53recoveryreadiness/readiness_checks/">readiness_checks</a><br />
-<a href="/services/route53recoveryreadiness/readiness_checks_list_only/">readiness_checks_list_only</a>
+<a href="/services/route53recoveryreadiness/readiness_checks/">readiness_checks</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/route53recoveryreadiness/recovery_groups/">recovery_groups</a><br />
-<a href="/services/route53recoveryreadiness/recovery_groups_list_only/">recovery_groups_list_only</a><br />
-<a href="/services/route53recoveryreadiness/resource_sets/">resource_sets</a><br />
-<a href="/services/route53recoveryreadiness/resource_sets_list_only/">resource_sets_list_only</a>
+<a href="/services/route53recoveryreadiness/resource_sets/">resource_sets</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/route53recoveryreadiness/readiness_checks/index.md b/website/docs/services/route53recoveryreadiness/readiness_checks/index.md
index 8947e56d6..0304bfcc9 100644
--- a/website/docs/services/route53recoveryreadiness/readiness_checks/index.md
+++ b/website/docs/services/route53recoveryreadiness/readiness_checks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>readiness_check</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "resource_set_name",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>readiness_check</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "readiness_check_name",
+    "type": "string",
+    "description": "Name of the ReadinessCheck to create."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-readinesscheck.html"><code>AWS::Route53RecoveryReadiness::ReadinessCheck</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>readiness_checks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>readiness_checks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>readiness_checks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>readiness_checks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>readiness_checks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>readiness_check</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ tags
 FROM awscc.route53recoveryreadiness.readiness_checks
 WHERE region = 'us-east-1' AND data__Identifier = '<ReadinessCheckName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>readiness_checks</code> in a region.
+```sql
+SELECT
+region,
+readiness_check_name
+FROM awscc.route53recoveryreadiness.readiness_checks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -199,6 +253,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53recoveryreadiness.readiness_checks
+SET data__PatchDocument = string('{{ {
+    "ResourceSetName": resource_set_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ReadinessCheckName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53recoveryreadiness/readiness_checks_list_only/index.md b/website/docs/services/route53recoveryreadiness/readiness_checks_list_only/index.md
deleted file mode 100644
index 051a8cce4..000000000
--- a/website/docs/services/route53recoveryreadiness/readiness_checks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: readiness_checks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - readiness_checks_list_only
-  - route53recoveryreadiness
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>readiness_checks</code> in a region or regions, for all properties use <a href="/services/route53recoveryreadiness/readiness_checks/"><code>readiness_checks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>readiness_checks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Aws Route53 Recovery Readiness Check Schema and API specification.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53recoveryreadiness.readiness_checks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "readiness_check_name",
-    "type": "string",
-    "description": "Name of the ReadinessCheck to create."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>readiness_checks</code> in a region.
-```sql
-SELECT
-region,
-readiness_check_name
-FROM awscc.route53recoveryreadiness.readiness_checks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>readiness_checks_list_only</code> resource, see <a href="/services/route53recoveryreadiness/readiness_checks/#permissions"><code>readiness_checks</code></a>
-
diff --git a/website/docs/services/route53recoveryreadiness/recovery_groups/index.md b/website/docs/services/route53recoveryreadiness/recovery_groups/index.md
index bd47416ed..2510f244d 100644
--- a/website/docs/services/route53recoveryreadiness/recovery_groups/index.md
+++ b/website/docs/services/route53recoveryreadiness/recovery_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>recovery_group</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "recovery_group_name",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>recovery_group</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "recovery_group_name",
+    "type": "string",
+    "description": "The name of the recovery group to create."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-recoverygroup.html"><code>AWS::Route53RecoveryReadiness::RecoveryGroup</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>recovery_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>recovery_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>recovery_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>recovery_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>recovery_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>recovery_group</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ tags
 FROM awscc.route53recoveryreadiness.recovery_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<RecoveryGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>recovery_groups</code> in a region.
+```sql
+SELECT
+region,
+recovery_group_name
+FROM awscc.route53recoveryreadiness.recovery_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -200,6 +254,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53recoveryreadiness.recovery_groups
+SET data__PatchDocument = string('{{ {
+    "Cells": cells,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RecoveryGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53recoveryreadiness/recovery_groups_list_only/index.md b/website/docs/services/route53recoveryreadiness/recovery_groups_list_only/index.md
deleted file mode 100644
index 4686f9894..000000000
--- a/website/docs/services/route53recoveryreadiness/recovery_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: recovery_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - recovery_groups_list_only
-  - route53recoveryreadiness
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>recovery_groups</code> in a region or regions, for all properties use <a href="/services/route53recoveryreadiness/recovery_groups/"><code>recovery_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>recovery_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS Route53 Recovery Readiness Recovery Group Schema and API specifications.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53recoveryreadiness.recovery_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "recovery_group_name",
-    "type": "string",
-    "description": "The name of the recovery group to create."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>recovery_groups</code> in a region.
-```sql
-SELECT
-region,
-recovery_group_name
-FROM awscc.route53recoveryreadiness.recovery_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>recovery_groups_list_only</code> resource, see <a href="/services/route53recoveryreadiness/recovery_groups/#permissions"><code>recovery_groups</code></a>
-
diff --git a/website/docs/services/route53recoveryreadiness/resource_sets/index.md b/website/docs/services/route53recoveryreadiness/resource_sets/index.md
index f7adedb25..9f46fe72a 100644
--- a/website/docs/services/route53recoveryreadiness/resource_sets/index.md
+++ b/website/docs/services/route53recoveryreadiness/resource_sets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_set</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "resource_set_name",
@@ -138,6 +147,23 @@ Creates, updates, deletes or gets a <code>resource_set</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "resource_set_name",
+    "type": "string",
+    "description": "The name of the resource set to create."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-resourceset.html"><code>AWS::Route53RecoveryReadiness::ResourceSet</code></a>.
 
@@ -147,31 +173,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_sets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResourceSetType, Resources, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_sets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_sets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_sets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_sets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -180,6 +212,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_set</code>.
 ```sql
 SELECT
@@ -192,6 +233,19 @@ tags
 FROM awscc.route53recoveryreadiness.resource_sets
 WHERE region = 'us-east-1' AND data__Identifier = '<ResourceSetName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_sets</code> in a region.
+```sql
+SELECT
+region,
+resource_set_name
+FROM awscc.route53recoveryreadiness.resource_sets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -283,6 +337,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53recoveryreadiness.resource_sets
+SET data__PatchDocument = string('{{ {
+    "Resources": resources,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ResourceSetName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53recoveryreadiness/resource_sets_list_only/index.md b/website/docs/services/route53recoveryreadiness/resource_sets_list_only/index.md
deleted file mode 100644
index 0462526a0..000000000
--- a/website/docs/services/route53recoveryreadiness/resource_sets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_sets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_sets_list_only
-  - route53recoveryreadiness
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_sets</code> in a region or regions, for all properties use <a href="/services/route53recoveryreadiness/resource_sets/"><code>resource_sets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_sets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Schema for the AWS Route53 Recovery Readiness ResourceSet Resource and API.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53recoveryreadiness.resource_sets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "resource_set_name",
-    "type": "string",
-    "description": "The name of the resource set to create."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_sets</code> in a region.
-```sql
-SELECT
-region,
-resource_set_name
-FROM awscc.route53recoveryreadiness.resource_sets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_sets_list_only</code> resource, see <a href="/services/route53recoveryreadiness/resource_sets/#permissions"><code>resource_sets</code></a>
-
diff --git a/website/docs/services/route53resolver/firewall_domain_lists/index.md b/website/docs/services/route53resolver/firewall_domain_lists/index.md
index fc2d66127..7de879924 100644
--- a/website/docs/services/route53resolver/firewall_domain_lists/index.md
+++ b/website/docs/services/route53resolver/firewall_domain_lists/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>firewall_domain_list</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -117,6 +126,23 @@ Creates, updates, deletes or gets a <code>firewall_domain_list</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "ResourceId"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewalldomainlist.html"><code>AWS::Route53Resolver::FirewallDomainList</code></a>.
 
@@ -126,31 +152,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>firewall_domain_lists</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>firewall_domain_lists</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>firewall_domain_lists</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>firewall_domain_lists_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>firewall_domain_lists</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -159,6 +191,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>firewall_domain_list</code>.
 ```sql
 SELECT
@@ -179,6 +220,19 @@ tags
 FROM awscc.route53resolver.firewall_domain_lists
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>firewall_domain_lists</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.route53resolver.firewall_domain_lists_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -260,6 +314,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53resolver.firewall_domain_lists
+SET data__PatchDocument = string('{{ {
+    "Domains": domains,
+    "DomainFileUrl": domain_file_url,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53resolver/firewall_domain_lists_list_only/index.md b/website/docs/services/route53resolver/firewall_domain_lists_list_only/index.md
deleted file mode 100644
index f6fe4ff68..000000000
--- a/website/docs/services/route53resolver/firewall_domain_lists_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: firewall_domain_lists_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - firewall_domain_lists_list_only
-  - route53resolver
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>firewall_domain_lists</code> in a region or regions, for all properties use <a href="/services/route53resolver/firewall_domain_lists/"><code>firewall_domain_lists</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>firewall_domain_lists_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Route53Resolver::FirewallDomainList.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53resolver.firewall_domain_lists_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "ResourceId"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>firewall_domain_lists</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.route53resolver.firewall_domain_lists_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>firewall_domain_lists_list_only</code> resource, see <a href="/services/route53resolver/firewall_domain_lists/#permissions"><code>firewall_domain_lists</code></a>
-
diff --git a/website/docs/services/route53resolver/firewall_rule_group_associations/index.md b/website/docs/services/route53resolver/firewall_rule_group_associations/index.md
index d66d09b0f..125b6bc94 100644
--- a/website/docs/services/route53resolver/firewall_rule_group_associations/index.md
+++ b/website/docs/services/route53resolver/firewall_rule_group_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>firewall_rule_group_association</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -122,6 +131,23 @@ Creates, updates, deletes or gets a <code>firewall_rule_group_association</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Id"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroupassociation.html"><code>AWS::Route53Resolver::FirewallRuleGroupAssociation</code></a>.
 
@@ -131,31 +157,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>firewall_rule_group_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FirewallRuleGroupId, VpcId, Priority, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>firewall_rule_group_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>firewall_rule_group_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>firewall_rule_group_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>firewall_rule_group_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -164,6 +196,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>firewall_rule_group_association</code>.
 ```sql
 SELECT
@@ -185,6 +226,19 @@ tags
 FROM awscc.route53resolver.firewall_rule_group_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>firewall_rule_group_associations</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.route53resolver.firewall_rule_group_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -271,6 +325,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53resolver.firewall_rule_group_associations
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Priority": priority,
+    "MutationProtection": mutation_protection,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53resolver/firewall_rule_group_associations_list_only/index.md b/website/docs/services/route53resolver/firewall_rule_group_associations_list_only/index.md
deleted file mode 100644
index 36a6df06c..000000000
--- a/website/docs/services/route53resolver/firewall_rule_group_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: firewall_rule_group_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - firewall_rule_group_associations_list_only
-  - route53resolver
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>firewall_rule_group_associations</code> in a region or regions, for all properties use <a href="/services/route53resolver/firewall_rule_group_associations/"><code>firewall_rule_group_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>firewall_rule_group_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Route53Resolver::FirewallRuleGroupAssociation.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53resolver.firewall_rule_group_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Id"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>firewall_rule_group_associations</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.route53resolver.firewall_rule_group_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>firewall_rule_group_associations_list_only</code> resource, see <a href="/services/route53resolver/firewall_rule_group_associations/#permissions"><code>firewall_rule_group_associations</code></a>
-
diff --git a/website/docs/services/route53resolver/firewall_rule_groups/index.md b/website/docs/services/route53resolver/firewall_rule_groups/index.md
index 80770fc95..c202010ae 100644
--- a/website/docs/services/route53resolver/firewall_rule_groups/index.md
+++ b/website/docs/services/route53resolver/firewall_rule_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>firewall_rule_group</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -179,6 +188,23 @@ Creates, updates, deletes or gets a <code>firewall_rule_group</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "ResourceId"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroup.html"><code>AWS::Route53Resolver::FirewallRuleGroup</code></a>.
 
@@ -188,31 +214,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>firewall_rule_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>firewall_rule_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>firewall_rule_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>firewall_rule_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>firewall_rule_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -221,6 +253,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>firewall_rule_group</code>.
 ```sql
 SELECT
@@ -241,6 +282,19 @@ tags
 FROM awscc.route53resolver.firewall_rule_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>firewall_rule_groups</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.route53resolver.firewall_rule_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -327,6 +381,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53resolver.firewall_rule_groups
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53resolver/firewall_rule_groups_list_only/index.md b/website/docs/services/route53resolver/firewall_rule_groups_list_only/index.md
deleted file mode 100644
index f233816d5..000000000
--- a/website/docs/services/route53resolver/firewall_rule_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: firewall_rule_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - firewall_rule_groups_list_only
-  - route53resolver
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>firewall_rule_groups</code> in a region or regions, for all properties use <a href="/services/route53resolver/firewall_rule_groups/"><code>firewall_rule_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>firewall_rule_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Route53Resolver::FirewallRuleGroup.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53resolver.firewall_rule_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "ResourceId"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>firewall_rule_groups</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.route53resolver.firewall_rule_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>firewall_rule_groups_list_only</code> resource, see <a href="/services/route53resolver/firewall_rule_groups/#permissions"><code>firewall_rule_groups</code></a>
-
diff --git a/website/docs/services/route53resolver/index.md b/website/docs/services/route53resolver/index.md
index 70b1df10d..b5426a4e0 100644
--- a/website/docs/services/route53resolver/index.md
+++ b/website/docs/services/route53resolver/index.md
@@ -20,7 +20,7 @@ The route53resolver service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>22</b></span><br />
+<span>total resources:&nbsp;<b>11</b></span><br />
 </div>
 </div>
 
@@ -30,28 +30,17 @@ The route53resolver service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/route53resolver/firewall_domain_lists/">firewall_domain_lists</a><br />
-<a href="/services/route53resolver/firewall_domain_lists_list_only/">firewall_domain_lists_list_only</a><br />
 <a href="/services/route53resolver/firewall_rule_group_associations/">firewall_rule_group_associations</a><br />
-<a href="/services/route53resolver/firewall_rule_group_associations_list_only/">firewall_rule_group_associations_list_only</a><br />
 <a href="/services/route53resolver/firewall_rule_groups/">firewall_rule_groups</a><br />
-<a href="/services/route53resolver/firewall_rule_groups_list_only/">firewall_rule_groups_list_only</a><br />
 <a href="/services/route53resolver/outpost_resolvers/">outpost_resolvers</a><br />
-<a href="/services/route53resolver/outpost_resolvers_list_only/">outpost_resolvers_list_only</a><br />
 <a href="/services/route53resolver/resolver_configs/">resolver_configs</a><br />
-<a href="/services/route53resolver/resolver_configs_list_only/">resolver_configs_list_only</a><br />
 <a href="/services/route53resolver/resolver_endpoints/">resolver_endpoints</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/route53resolver/resolver_endpoints_list_only/">resolver_endpoints_list_only</a><br />
 <a href="/services/route53resolver/resolver_query_logging_config_associations/">resolver_query_logging_config_associations</a><br />
-<a href="/services/route53resolver/resolver_query_logging_config_associations_list_only/">resolver_query_logging_config_associations_list_only</a><br />
 <a href="/services/route53resolver/resolver_query_logging_configs/">resolver_query_logging_configs</a><br />
-<a href="/services/route53resolver/resolver_query_logging_configs_list_only/">resolver_query_logging_configs_list_only</a><br />
 <a href="/services/route53resolver/resolver_rule_associations/">resolver_rule_associations</a><br />
-<a href="/services/route53resolver/resolver_rule_associations_list_only/">resolver_rule_associations_list_only</a><br />
 <a href="/services/route53resolver/resolver_rules/">resolver_rules</a><br />
-<a href="/services/route53resolver/resolver_rules_list_only/">resolver_rules_list_only</a><br />
-<a href="/services/route53resolver/resolverdnssec_configs/">resolverdnssec_configs</a><br />
-<a href="/services/route53resolver/resolverdnssec_configs_list_only/">resolverdnssec_configs_list_only</a>
+<a href="/services/route53resolver/resolverdnssec_configs/">resolverdnssec_configs</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/route53resolver/outpost_resolvers/index.md b/website/docs/services/route53resolver/outpost_resolvers/index.md
index 76fcd3f2f..d29c1c0f3 100644
--- a/website/docs/services/route53resolver/outpost_resolvers/index.md
+++ b/website/docs/services/route53resolver/outpost_resolvers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>outpost_resolver</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -112,6 +121,23 @@ Creates, updates, deletes or gets an <code>outpost_resolver</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Id"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-outpostresolver.html"><code>AWS::Route53Resolver::OutpostResolver</code></a>.
 
@@ -121,31 +147,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>outpost_resolvers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="OutpostArn, PreferredInstanceType, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>outpost_resolvers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>outpost_resolvers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>outpost_resolvers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>outpost_resolvers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -154,6 +186,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>outpost_resolver</code>.
 ```sql
 SELECT
@@ -173,6 +214,19 @@ tags
 FROM awscc.route53resolver.outpost_resolvers
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>outpost_resolvers</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.route53resolver.outpost_resolvers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -255,6 +309,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53resolver.outpost_resolvers
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "PreferredInstanceType": preferred_instance_type,
+    "InstanceCount": instance_count,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53resolver/outpost_resolvers_list_only/index.md b/website/docs/services/route53resolver/outpost_resolvers_list_only/index.md
deleted file mode 100644
index 7562e604f..000000000
--- a/website/docs/services/route53resolver/outpost_resolvers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: outpost_resolvers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - outpost_resolvers_list_only
-  - route53resolver
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>outpost_resolvers</code> in a region or regions, for all properties use <a href="/services/route53resolver/outpost_resolvers/"><code>outpost_resolvers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>outpost_resolvers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Route53Resolver::OutpostResolver.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53resolver.outpost_resolvers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Id"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>outpost_resolvers</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.route53resolver.outpost_resolvers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>outpost_resolvers_list_only</code> resource, see <a href="/services/route53resolver/outpost_resolvers/#permissions"><code>outpost_resolvers</code></a>
-
diff --git a/website/docs/services/route53resolver/resolver_configs/index.md b/website/docs/services/route53resolver/resolver_configs/index.md
index b7426700c..2e7f1f61d 100644
--- a/website/docs/services/route53resolver/resolver_configs/index.md
+++ b/website/docs/services/route53resolver/resolver_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resolver_config</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -65,6 +74,28 @@ Creates, updates, deletes or gets a <code>resolver_config</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Id"
+  },
+  {
+    "name": "resource_id",
+    "type": "string",
+    "description": "ResourceId"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverconfig.html"><code>AWS::Route53Resolver::ResolverConfig</code></a>.
 
@@ -74,26 +105,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resolver_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResourceId, AutodefinedReverseFlag, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resolver_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resolver_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resolver_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +138,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resolver_config</code>.
 ```sql
 SELECT
@@ -114,6 +159,19 @@ autodefined_reverse_flag
 FROM awscc.route53resolver.resolver_configs
 WHERE region = 'us-east-1' AND data__Identifier = '<ResourceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resolver_configs</code> in a region.
+```sql
+SELECT
+region,
+resource_id
+FROM awscc.route53resolver.resolver_configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -180,6 +238,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53resolver/resolver_configs_list_only/index.md b/website/docs/services/route53resolver/resolver_configs_list_only/index.md
deleted file mode 100644
index d0725e31d..000000000
--- a/website/docs/services/route53resolver/resolver_configs_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: resolver_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resolver_configs_list_only
-  - route53resolver
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resolver_configs</code> in a region or regions, for all properties use <a href="/services/route53resolver/resolver_configs/"><code>resolver_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resolver_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Route53Resolver::ResolverConfig.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53resolver.resolver_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Id"
-  },
-  {
-    "name": "resource_id",
-    "type": "string",
-    "description": "ResourceId"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resolver_configs</code> in a region.
-```sql
-SELECT
-region,
-resource_id
-FROM awscc.route53resolver.resolver_configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resolver_configs_list_only</code> resource, see <a href="/services/route53resolver/resolver_configs/#permissions"><code>resolver_configs</code></a>
-
diff --git a/website/docs/services/route53resolver/resolver_endpoints/index.md b/website/docs/services/route53resolver/resolver_endpoints/index.md
index 24e906f58..8dc4746d1 100644
--- a/website/docs/services/route53resolver/resolver_endpoints/index.md
+++ b/website/docs/services/route53resolver/resolver_endpoints/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resolver_endpoint</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -134,6 +143,23 @@ Creates, updates, deletes or gets a <code>resolver_endpoint</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "resolver_endpoint_id",
+    "type": "string",
+    "description": "The ID of the resolver endpoint."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html"><code>AWS::Route53Resolver::ResolverEndpoint</code></a>.
 
@@ -143,31 +169,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resolver_endpoints</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Direction, IpAddresses, SecurityGroupIds, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resolver_endpoints</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resolver_endpoints</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resolver_endpoints_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resolver_endpoints</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -176,6 +208,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resolver_endpoint</code>.
 ```sql
 SELECT
@@ -196,6 +237,19 @@ tags
 FROM awscc.route53resolver.resolver_endpoints
 WHERE region = 'us-east-1' AND data__Identifier = '<ResolverEndpointId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resolver_endpoints</code> in a region.
+```sql
+SELECT
+region,
+resolver_endpoint_id
+FROM awscc.route53resolver.resolver_endpoints_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -299,6 +353,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53resolver.resolver_endpoints
+SET data__PatchDocument = string('{{ {
+    "IpAddresses": ip_addresses,
+    "Name": name,
+    "Protocols": protocols,
+    "ResolverEndpointType": resolver_endpoint_type,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ResolverEndpointId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53resolver/resolver_endpoints_list_only/index.md b/website/docs/services/route53resolver/resolver_endpoints_list_only/index.md
deleted file mode 100644
index e86a96f8e..000000000
--- a/website/docs/services/route53resolver/resolver_endpoints_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resolver_endpoints_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resolver_endpoints_list_only
-  - route53resolver
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resolver_endpoints</code> in a region or regions, for all properties use <a href="/services/route53resolver/resolver_endpoints/"><code>resolver_endpoints</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resolver_endpoints_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::Route53Resolver::ResolverEndpoint</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53resolver.resolver_endpoints_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "resolver_endpoint_id",
-    "type": "string",
-    "description": "The ID of the resolver endpoint."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resolver_endpoints</code> in a region.
-```sql
-SELECT
-region,
-resolver_endpoint_id
-FROM awscc.route53resolver.resolver_endpoints_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resolver_endpoints_list_only</code> resource, see <a href="/services/route53resolver/resolver_endpoints/#permissions"><code>resolver_endpoints</code></a>
-
diff --git a/website/docs/services/route53resolver/resolver_query_logging_config_associations/index.md b/website/docs/services/route53resolver/resolver_query_logging_config_associations/index.md
index 5ec4a7c15..daa838b58 100644
--- a/website/docs/services/route53resolver/resolver_query_logging_config_associations/index.md
+++ b/website/docs/services/route53resolver/resolver_query_logging_config_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resolver_query_logging_config_associat
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -75,6 +84,23 @@ Creates, updates, deletes or gets a <code>resolver_query_logging_config_associat
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Id"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverqueryloggingconfigassociation.html"><code>AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation</code></a>.
 
@@ -84,26 +110,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resolver_query_logging_config_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resolver_query_logging_config_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resolver_query_logging_config_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resolver_query_logging_config_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +143,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resolver_query_logging_config_association</code>.
 ```sql
 SELECT
@@ -126,6 +166,19 @@ creation_time
 FROM awscc.route53resolver.resolver_query_logging_config_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resolver_query_logging_config_associations</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.route53resolver.resolver_query_logging_config_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -192,6 +245,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53resolver/resolver_query_logging_config_associations_list_only/index.md b/website/docs/services/route53resolver/resolver_query_logging_config_associations_list_only/index.md
deleted file mode 100644
index 3b25c5014..000000000
--- a/website/docs/services/route53resolver/resolver_query_logging_config_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resolver_query_logging_config_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resolver_query_logging_config_associations_list_only
-  - route53resolver
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resolver_query_logging_config_associations</code> in a region or regions, for all properties use <a href="/services/route53resolver/resolver_query_logging_config_associations/"><code>resolver_query_logging_config_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resolver_query_logging_config_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53resolver.resolver_query_logging_config_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Id"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resolver_query_logging_config_associations</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.route53resolver.resolver_query_logging_config_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resolver_query_logging_config_associations_list_only</code> resource, see <a href="/services/route53resolver/resolver_query_logging_config_associations/#permissions"><code>resolver_query_logging_config_associations</code></a>
-
diff --git a/website/docs/services/route53resolver/resolver_query_logging_configs/index.md b/website/docs/services/route53resolver/resolver_query_logging_configs/index.md
index 51f60fc5d..3da144185 100644
--- a/website/docs/services/route53resolver/resolver_query_logging_configs/index.md
+++ b/website/docs/services/route53resolver/resolver_query_logging_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resolver_query_logging_config</code> r
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -107,6 +116,23 @@ Creates, updates, deletes or gets a <code>resolver_query_logging_config</code> r
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "ResourceId"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverqueryloggingconfig.html"><code>AWS::Route53Resolver::ResolverQueryLoggingConfig</code></a>.
 
@@ -116,26 +142,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resolver_query_logging_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resolver_query_logging_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resolver_query_logging_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resolver_query_logging_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -144,6 +175,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resolver_query_logging_config</code>.
 ```sql
 SELECT
@@ -162,6 +202,19 @@ tags
 FROM awscc.route53resolver.resolver_query_logging_configs
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resolver_query_logging_configs</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.route53resolver.resolver_query_logging_configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -236,6 +289,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53resolver/resolver_query_logging_configs_list_only/index.md b/website/docs/services/route53resolver/resolver_query_logging_configs_list_only/index.md
deleted file mode 100644
index c7a19de0a..000000000
--- a/website/docs/services/route53resolver/resolver_query_logging_configs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resolver_query_logging_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resolver_query_logging_configs_list_only
-  - route53resolver
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resolver_query_logging_configs</code> in a region or regions, for all properties use <a href="/services/route53resolver/resolver_query_logging_configs/"><code>resolver_query_logging_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resolver_query_logging_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Route53Resolver::ResolverQueryLoggingConfig.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53resolver.resolver_query_logging_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "ResourceId"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resolver_query_logging_configs</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.route53resolver.resolver_query_logging_configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resolver_query_logging_configs_list_only</code> resource, see <a href="/services/route53resolver/resolver_query_logging_configs/#permissions"><code>resolver_query_logging_configs</code></a>
-
diff --git a/website/docs/services/route53resolver/resolver_rule_associations/index.md b/website/docs/services/route53resolver/resolver_rule_associations/index.md
index 9fc90253a..6354b503c 100644
--- a/website/docs/services/route53resolver/resolver_rule_associations/index.md
+++ b/website/docs/services/route53resolver/resolver_rule_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resolver_rule_association</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "vpc_id",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets a <code>resolver_rule_association</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "resolver_rule_association_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html"><code>AWS::Route53Resolver::ResolverRuleAssociation</code></a>.
 
@@ -69,26 +95,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resolver_rule_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="VPCId, ResolverRuleId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resolver_rule_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resolver_rule_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resolver_rule_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +128,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resolver_rule_association</code>.
 ```sql
 SELECT
@@ -108,6 +148,19 @@ name
 FROM awscc.route53resolver.resolver_rule_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<ResolverRuleAssociationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resolver_rule_associations</code> in a region.
+```sql
+SELECT
+region,
+resolver_rule_association_id
+FROM awscc.route53resolver.resolver_rule_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -178,6 +231,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53resolver/resolver_rule_associations_list_only/index.md b/website/docs/services/route53resolver/resolver_rule_associations_list_only/index.md
deleted file mode 100644
index 763f552df..000000000
--- a/website/docs/services/route53resolver/resolver_rule_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resolver_rule_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resolver_rule_associations_list_only
-  - route53resolver
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resolver_rule_associations</code> in a region or regions, for all properties use <a href="/services/route53resolver/resolver_rule_associations/"><code>resolver_rule_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resolver_rule_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>In the response to an &#91;AssociateResolverRule&#93;(https://docs.aws.amazon.com/Route53/latest/APIReference/API&#95;route53resolver&#95;AssociateResolverRule.html), &#91;DisassociateResolverRule&#93;(https://docs.aws.amazon.com/Route53/latest/APIReference/API&#95;route53resolver&#95;DisassociateResolverRule.html), or &#91;ListResolverRuleAssociations&#93;(https://docs.aws.amazon.com/Route53/latest/APIReference/API&#95;route53resolver&#95;ListResolverRuleAssociations.html) request, provides information about an association between a resolver rule and a VPC. The association determines which DNS queries that originate in the VPC are forwarded to your network.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53resolver.resolver_rule_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "resolver_rule_association_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resolver_rule_associations</code> in a region.
-```sql
-SELECT
-region,
-resolver_rule_association_id
-FROM awscc.route53resolver.resolver_rule_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resolver_rule_associations_list_only</code> resource, see <a href="/services/route53resolver/resolver_rule_associations/#permissions"><code>resolver_rule_associations</code></a>
-
diff --git a/website/docs/services/route53resolver/resolver_rules/index.md b/website/docs/services/route53resolver/resolver_rules/index.md
index f8c356cce..15e191009 100644
--- a/website/docs/services/route53resolver/resolver_rules/index.md
+++ b/website/docs/services/route53resolver/resolver_rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resolver_rule</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "resolver_endpoint_id",
@@ -124,6 +133,23 @@ Creates, updates, deletes or gets a <code>resolver_rule</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "resolver_rule_id",
+    "type": "string",
+    "description": "The ID of the endpoint that the rule is associated with."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html"><code>AWS::Route53Resolver::ResolverRule</code></a>.
 
@@ -133,31 +159,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resolver_rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RuleType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resolver_rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resolver_rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resolver_rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resolver_rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -166,6 +198,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resolver_rule</code>.
 ```sql
 SELECT
@@ -182,6 +223,19 @@ resolver_rule_id
 FROM awscc.route53resolver.resolver_rules
 WHERE region = 'us-east-1' AND data__Identifier = '<ResolverRuleId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resolver_rules</code> in a region.
+```sql
+SELECT
+region,
+resolver_rule_id
+FROM awscc.route53resolver.resolver_rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -273,6 +327,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.route53resolver.resolver_rules
+SET data__PatchDocument = string('{{ {
+    "ResolverEndpointId": resolver_endpoint_id,
+    "DomainName": domain_name,
+    "Name": name,
+    "DelegationRecord": delegation_record,
+    "Tags": tags,
+    "TargetIps": target_ips
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ResolverRuleId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53resolver/resolver_rules_list_only/index.md b/website/docs/services/route53resolver/resolver_rules_list_only/index.md
deleted file mode 100644
index 71ffb3dd5..000000000
--- a/website/docs/services/route53resolver/resolver_rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resolver_rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resolver_rules_list_only
-  - route53resolver
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resolver_rules</code> in a region or regions, for all properties use <a href="/services/route53resolver/resolver_rules/"><code>resolver_rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resolver_rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Route53Resolver::ResolverRule</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53resolver.resolver_rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "resolver_rule_id",
-    "type": "string",
-    "description": "The ID of the endpoint that the rule is associated with."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resolver_rules</code> in a region.
-```sql
-SELECT
-region,
-resolver_rule_id
-FROM awscc.route53resolver.resolver_rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resolver_rules_list_only</code> resource, see <a href="/services/route53resolver/resolver_rules/#permissions"><code>resolver_rules</code></a>
-
diff --git a/website/docs/services/route53resolver/resolverdnssec_configs/index.md b/website/docs/services/route53resolver/resolverdnssec_configs/index.md
index ffba16ce1..5dae39f00 100644
--- a/website/docs/services/route53resolver/resolverdnssec_configs/index.md
+++ b/website/docs/services/route53resolver/resolverdnssec_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resolverdnssec_config</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets a <code>resolverdnssec_config</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Id"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverdnssecconfig.html"><code>AWS::Route53Resolver::ResolverDNSSECConfig</code></a>.
 
@@ -69,26 +95,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resolverdnssec_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resolverdnssec_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resolverdnssec_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resolverdnssec_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +128,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resolverdnssec_config</code>.
 ```sql
 SELECT
@@ -108,6 +148,19 @@ validation_status
 FROM awscc.route53resolver.resolverdnssec_configs
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resolverdnssec_configs</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.route53resolver.resolverdnssec_configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -168,6 +221,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/route53resolver/resolverdnssec_configs_list_only/index.md b/website/docs/services/route53resolver/resolverdnssec_configs_list_only/index.md
deleted file mode 100644
index bc2db694d..000000000
--- a/website/docs/services/route53resolver/resolverdnssec_configs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resolverdnssec_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resolverdnssec_configs_list_only
-  - route53resolver
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resolverdnssec_configs</code> in a region or regions, for all properties use <a href="/services/route53resolver/resolverdnssec_configs/"><code>resolverdnssec_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resolverdnssec_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::Route53Resolver::ResolverDNSSECConfig.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.route53resolver.resolverdnssec_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Id"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resolverdnssec_configs</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.route53resolver.resolverdnssec_configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resolverdnssec_configs_list_only</code> resource, see <a href="/services/route53resolver/resolverdnssec_configs/#permissions"><code>resolverdnssec_configs</code></a>
-
diff --git a/website/docs/services/rum/app_monitors/index.md b/website/docs/services/rum/app_monitors/index.md
index c9f60c2da..a8f14c18d 100644
--- a/website/docs/services/rum/app_monitors/index.md
+++ b/website/docs/services/rum/app_monitors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>app_monitor</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -241,6 +250,23 @@ Creates, updates, deletes or gets an <code>app_monitor</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "A name for the app monitor"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rum-appmonitor.html"><code>AWS::RUM::AppMonitor</code></a>.
 
@@ -250,31 +276,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>app_monitors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>app_monitors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>app_monitors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>app_monitors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>app_monitors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -283,6 +315,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>app_monitor</code>.
 ```sql
 SELECT
@@ -300,6 +341,19 @@ deobfuscation_configuration
 FROM awscc.rum.app_monitors
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>app_monitors</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.rum.app_monitors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -424,6 +478,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.rum.app_monitors
+SET data__PatchDocument = string('{{ {
+    "Domain": domain,
+    "DomainList": domain_list,
+    "CwLogEnabled": cw_log_enabled,
+    "Tags": tags,
+    "AppMonitorConfiguration": app_monitor_configuration,
+    "CustomEvents": custom_events,
+    "ResourcePolicy": resource_policy,
+    "DeobfuscationConfiguration": deobfuscation_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/rum/app_monitors_list_only/index.md b/website/docs/services/rum/app_monitors_list_only/index.md
deleted file mode 100644
index 9d3280f50..000000000
--- a/website/docs/services/rum/app_monitors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: app_monitors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - app_monitors_list_only
-  - rum
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>app_monitors</code> in a region or regions, for all properties use <a href="/services/rum/app_monitors/"><code>app_monitors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>app_monitors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::RUM::AppMonitor</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.rum.app_monitors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "A name for the app monitor"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>app_monitors</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.rum.app_monitors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>app_monitors_list_only</code> resource, see <a href="/services/rum/app_monitors/#permissions"><code>app_monitors</code></a>
-
diff --git a/website/docs/services/rum/index.md b/website/docs/services/rum/index.md
index c38791841..9f25eb26d 100644
--- a/website/docs/services/rum/index.md
+++ b/website/docs/services/rum/index.md
@@ -20,7 +20,7 @@ The rum service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The rum service documentation.
 <a href="/services/rum/app_monitors/">app_monitors</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/rum/app_monitors_list_only/">app_monitors_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/s3/access_grants/index.md b/website/docs/services/s3/access_grants/index.md
index d5ec28932..29a83da57 100644
--- a/website/docs/services/s3/access_grants/index.md
+++ b/website/docs/services/s3/access_grants/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>access_grant</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "access_grant_id",
@@ -121,6 +130,23 @@ Creates, updates, deletes or gets an <code>access_grant</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "access_grant_id",
+    "type": "string",
+    "description": "The ID assigned to this access grant."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-accessgrant.html"><code>AWS::S3::AccessGrant</code></a>.
 
@@ -130,31 +156,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>access_grants</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Grantee, Permission, AccessGrantsLocationId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>access_grants</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>access_grants</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>access_grants_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>access_grants</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -163,6 +195,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>access_grant</code>.
 ```sql
 SELECT
@@ -180,6 +221,19 @@ access_grants_location_configuration
 FROM awscc.s3.access_grants
 WHERE region = 'us-east-1' AND data__Identifier = '<AccessGrantId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>access_grants</code> in a region.
+```sql
+SELECT
+region,
+access_grant_id
+FROM awscc.s3.access_grants_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -273,6 +327,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3.access_grants
+SET data__PatchDocument = string('{{ {
+    "AccessGrantsLocationId": access_grants_location_id,
+    "Permission": permission,
+    "ApplicationArn": application_arn,
+    "Grantee": grantee,
+    "AccessGrantsLocationConfiguration": access_grants_location_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccessGrantId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3/access_grants_instances/index.md b/website/docs/services/s3/access_grants_instances/index.md
index 77cfe5d97..75799ec1c 100644
--- a/website/docs/services/s3/access_grants_instances/index.md
+++ b/website/docs/services/s3/access_grants_instances/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>access_grants_instance</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "access_grants_instance_arn",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets an <code>access_grants_instance</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "access_grants_instance_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the specified Access Grants instance."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-accessgrantsinstance.html"><code>AWS::S3::AccessGrantsInstance</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>access_grants_instances</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>access_grants_instances</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>access_grants_instances</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>access_grants_instances_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>access_grants_instances</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>access_grants_instance</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ tags
 FROM awscc.s3.access_grants_instances
 WHERE region = 'us-east-1' AND data__Identifier = '<AccessGrantsInstanceArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>access_grants_instances</code> in a region.
+```sql
+SELECT
+region,
+access_grants_instance_arn
+FROM awscc.s3.access_grants_instances_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -191,6 +245,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3.access_grants_instances
+SET data__PatchDocument = string('{{ {
+    "IdentityCenterArn": identity_center_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccessGrantsInstanceArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3/access_grants_instances_list_only/index.md b/website/docs/services/s3/access_grants_instances_list_only/index.md
deleted file mode 100644
index 5f16981a3..000000000
--- a/website/docs/services/s3/access_grants_instances_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: access_grants_instances_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - access_grants_instances_list_only
-  - s3
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>access_grants_instances</code> in a region or regions, for all properties use <a href="/services/s3/access_grants_instances/"><code>access_grants_instances</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>access_grants_instances_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::S3::AccessGrantsInstance resource is an Amazon S3 resource type that hosts Access Grants and their associated locations</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3.access_grants_instances_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "access_grants_instance_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the specified Access Grants instance."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>access_grants_instances</code> in a region.
-```sql
-SELECT
-region,
-access_grants_instance_arn
-FROM awscc.s3.access_grants_instances_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>access_grants_instances_list_only</code> resource, see <a href="/services/s3/access_grants_instances/#permissions"><code>access_grants_instances</code></a>
-
diff --git a/website/docs/services/s3/access_grants_list_only/index.md b/website/docs/services/s3/access_grants_list_only/index.md
deleted file mode 100644
index 4b731029e..000000000
--- a/website/docs/services/s3/access_grants_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: access_grants_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - access_grants_list_only
-  - s3
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>access_grants</code> in a region or regions, for all properties use <a href="/services/s3/access_grants/"><code>access_grants</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>access_grants_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::S3::AccessGrant resource is an Amazon S3 resource type representing permissions to a specific S3 bucket or prefix hosted in an S3 Access Grants instance.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3.access_grants_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "access_grant_id",
-    "type": "string",
-    "description": "The ID assigned to this access grant."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>access_grants</code> in a region.
-```sql
-SELECT
-region,
-access_grant_id
-FROM awscc.s3.access_grants_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>access_grants_list_only</code> resource, see <a href="/services/s3/access_grants/#permissions"><code>access_grants</code></a>
-
diff --git a/website/docs/services/s3/access_grants_locations/index.md b/website/docs/services/s3/access_grants_locations/index.md
index 945a0af64..343d1080c 100644
--- a/website/docs/services/s3/access_grants_locations/index.md
+++ b/website/docs/services/s3/access_grants_locations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>access_grants_location</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "access_grants_location_arn",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets an <code>access_grants_location</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "access_grants_location_id",
+    "type": "string",
+    "description": "The unique identifier for the specified Access Grants location."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-accessgrantslocation.html"><code>AWS::S3::AccessGrantsLocation</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>access_grants_locations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>access_grants_locations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>access_grants_locations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>access_grants_locations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>access_grants_locations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>access_grants_location</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.s3.access_grants_locations
 WHERE region = 'us-east-1' AND data__Identifier = '<AccessGrantsLocationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>access_grants_locations</code> in a region.
+```sql
+SELECT
+region,
+access_grants_location_id
+FROM awscc.s3.access_grants_locations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -201,6 +255,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3.access_grants_locations
+SET data__PatchDocument = string('{{ {
+    "IamRoleArn": iam_role_arn,
+    "LocationScope": location_scope
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccessGrantsLocationId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3/access_grants_locations_list_only/index.md b/website/docs/services/s3/access_grants_locations_list_only/index.md
deleted file mode 100644
index fc9828813..000000000
--- a/website/docs/services/s3/access_grants_locations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: access_grants_locations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - access_grants_locations_list_only
-  - s3
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>access_grants_locations</code> in a region or regions, for all properties use <a href="/services/s3/access_grants_locations/"><code>access_grants_locations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>access_grants_locations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::S3::AccessGrantsLocation resource is an Amazon S3 resource type hosted in an access grants instance which can be the target of S3 access grants.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3.access_grants_locations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "access_grants_location_id",
-    "type": "string",
-    "description": "The unique identifier for the specified Access Grants location."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>access_grants_locations</code> in a region.
-```sql
-SELECT
-region,
-access_grants_location_id
-FROM awscc.s3.access_grants_locations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>access_grants_locations_list_only</code> resource, see <a href="/services/s3/access_grants_locations/#permissions"><code>access_grants_locations</code></a>
-
diff --git a/website/docs/services/s3/access_points/index.md b/website/docs/services/s3/access_points/index.md
index 7ef3868ac..67ed829ef 100644
--- a/website/docs/services/s3/access_points/index.md
+++ b/website/docs/services/s3/access_points/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>access_point</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -131,6 +140,23 @@ Creates, updates, deletes or gets an <code>access_point</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name you want to assign to this Access Point. If you don't specify a name, AWS CloudFormation generates a unique ID and uses that ID for the access point name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-accesspoint.html"><code>AWS::S3::AccessPoint</code></a>.
 
@@ -140,31 +166,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Bucket, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>access_points_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -173,6 +205,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>access_point</code>.
 ```sql
 SELECT
@@ -190,6 +231,19 @@ tags
 FROM awscc.s3.access_points
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>access_points</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.s3.access_points_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -281,6 +335,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3.access_points
+SET data__PatchDocument = string('{{ {
+    "PublicAccessBlockConfiguration": public_access_block_configuration,
+    "Policy": policy,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3/access_points_list_only/index.md b/website/docs/services/s3/access_points_list_only/index.md
deleted file mode 100644
index d558489ce..000000000
--- a/website/docs/services/s3/access_points_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: access_points_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - access_points_list_only
-  - s3
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>access_points</code> in a region or regions, for all properties use <a href="/services/s3/access_points/"><code>access_points</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>access_points_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::S3::AccessPoint resource is an Amazon S3 resource type that you can use to access buckets.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3.access_points_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name you want to assign to this Access Point. If you don't specify a name, AWS CloudFormation generates a unique ID and uses that ID for the access point name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>access_points</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.s3.access_points_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>access_points_list_only</code> resource, see <a href="/services/s3/access_points/#permissions"><code>access_points</code></a>
-
diff --git a/website/docs/services/s3/bucket_policies/index.md b/website/docs/services/s3/bucket_policies/index.md
index 3ed12e0a9..ed2485de2 100644
--- a/website/docs/services/s3/bucket_policies/index.md
+++ b/website/docs/services/s3/bucket_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>bucket_policy</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "bucket",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>bucket_policy</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "bucket",
+    "type": "string",
+    "description": "The name of the Amazon S3 bucket to which the policy applies."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-bucketpolicy.html"><code>AWS::S3::BucketPolicy</code></a>.
 
@@ -59,31 +85,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>bucket_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Bucket, PolicyDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>bucket_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>bucket_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>bucket_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>bucket_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +124,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>bucket_policy</code>.
 ```sql
 SELECT
@@ -101,6 +142,19 @@ policy_document
 FROM awscc.s3.bucket_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Bucket>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>bucket_policies</code> in a region.
+```sql
+SELECT
+region,
+bucket
+FROM awscc.s3.bucket_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -167,6 +221,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3.bucket_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyDocument": policy_document
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Bucket>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3/bucket_policies_list_only/index.md b/website/docs/services/s3/bucket_policies_list_only/index.md
deleted file mode 100644
index 74a46cca1..000000000
--- a/website/docs/services/s3/bucket_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: bucket_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - bucket_policies_list_only
-  - s3
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>bucket_policies</code> in a region or regions, for all properties use <a href="/services/s3/bucket_policies/"><code>bucket_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>bucket_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Applies an Amazon S3 bucket policy to an Amazon S3 bucket. If you are using an identity other than the root user of the AWS-account that owns the bucket, the calling identity must have the &#96;&#96;PutBucketPolicy&#96;&#96; permissions on the specified bucket and belong to the bucket owner's account in order to use this operation.<br />If you don't have &#96;&#96;PutBucketPolicy&#96;&#96; permissions, Amazon S3 returns a &#96;&#96;403 Access Denied&#96;&#96; error. If you have the correct permissions, but you're not using an identity that belongs to the bucket owner's account, Amazon S3 returns a &#96;&#96;405 Method Not Allowed&#96;&#96; error.<br />As a security precaution, the root user of the AWS-account that owns a bucket can always use this operation, even if the policy explicitly denies the root user the ability to perform this action. <br />When using the &#96;&#96;AWS::S3::BucketPolicy&#96;&#96; resource, you can create, update, and delete bucket policies for S3 buckets located in Regions that are different from the stack's Region. However, the CloudFormation stacks should be deployed in the US East (N. Virginia) or &#96;&#96;us-east-1&#96;&#96; Region. This cross-region bucket policy modification functionality is supported for backward compatibility with existing workflows.<br />If the &#91;DeletionPolicy attribute&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html) is not specified or set to &#96;&#96;Delete&#96;&#96;, the bucket policy will be removed when the stack is deleted. If set to &#96;&#96;Retain&#96;&#96;, the bucket policy will be preserved even after the stack is deleted.<br />For example, a CloudFormation stack in &#96;&#96;us-east-1&#96;&#96; can use the &#96;&#96;AWS::S3::BucketPolicy&#96;&#96; resource to manage the bucket policy for an S3 bucket in &#96;&#96;us-west-2&#96;&#96;. The retention or removal of the bucket policy during the stack deletion is determined by the &#96;&#96;DeletionPolicy&#96;&#96; attribute specified in the stack template.<br />For more information, see &#91;Bucket policy examples&#93;(https://docs.aws.amazon.com/AmazonS3/latest/userguide/example-bucket-policies.html).<br />The following operations are related to &#96;&#96;PutBucketPolicy&#96;&#96;:<br />+ &#91;CreateBucket&#93;(https://docs.aws.amazon.com/AmazonS3/latest/API/API&#95;CreateBucket.html) <br />+ &#91;DeleteBucket&#93;(https://docs.aws.amazon.com/AmazonS3/latest/API/API&#95;DeleteBucket.html)</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3.bucket_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "bucket",
-    "type": "string",
-    "description": "The name of the Amazon S3 bucket to which the policy applies."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>bucket_policies</code> in a region.
-```sql
-SELECT
-region,
-bucket
-FROM awscc.s3.bucket_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>bucket_policies_list_only</code> resource, see <a href="/services/s3/bucket_policies/#permissions"><code>bucket_policies</code></a>
-
diff --git a/website/docs/services/s3/buckets/index.md b/website/docs/services/s3/buckets/index.md
index 82182fa59..ea072fb1d 100644
--- a/website/docs/services/s3/buckets/index.md
+++ b/website/docs/services/s3/buckets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>bucket</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "accelerate_configuration",
@@ -1167,6 +1176,23 @@ Creates, updates, deletes or gets a <code>bucket</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "bucket_name",
+    "type": "string",
+    "description": "A name for the bucket. If you don't specify a name, AWS CloudFormation generates a unique ID and uses that ID for the bucket name. The bucket name must contain only lowercase letters, numbers, periods (.), and dashes (-) and must follow &#91;Amazon S3 bucket restrictions and limitations&#93;(https://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html). For more information, see &#91;Rules for naming Amazon S3 buckets&#93;(https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html) in the &#42;Amazon S3 User Guide&#42;. <br />If you specify a name, you can't perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you need to replace the resource, specify a new name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-bucket.html"><code>AWS::S3::Bucket</code></a>.
 
@@ -1176,31 +1202,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>buckets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="BucketName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>buckets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>buckets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>buckets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>buckets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -1209,6 +1241,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>bucket</code>.
 ```sql
 SELECT
@@ -1243,6 +1284,19 @@ website_url
 FROM awscc.s3.buckets
 WHERE region = 'us-east-1' AND data__Identifier = '<BucketName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>buckets</code> in a region.
+```sql
+SELECT
+region,
+bucket_name
+FROM awscc.s3.buckets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1584,6 +1638,37 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3.buckets
+SET data__PatchDocument = string('{{ {
+    "AccelerateConfiguration": accelerate_configuration,
+    "AccessControl": access_control,
+    "AnalyticsConfigurations": analytics_configurations,
+    "BucketEncryption": bucket_encryption,
+    "CorsConfiguration": cors_configuration,
+    "IntelligentTieringConfigurations": intelligent_tiering_configurations,
+    "InventoryConfigurations": inventory_configurations,
+    "LifecycleConfiguration": lifecycle_configuration,
+    "LoggingConfiguration": logging_configuration,
+    "MetricsConfigurations": metrics_configurations,
+    "NotificationConfiguration": notification_configuration,
+    "ObjectLockConfiguration": object_lock_configuration,
+    "ObjectLockEnabled": object_lock_enabled,
+    "OwnershipControls": ownership_controls,
+    "PublicAccessBlockConfiguration": public_access_block_configuration,
+    "ReplicationConfiguration": replication_configuration,
+    "Tags": tags,
+    "VersioningConfiguration": versioning_configuration,
+    "WebsiteConfiguration": website_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<BucketName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3/buckets_list_only/index.md b/website/docs/services/s3/buckets_list_only/index.md
deleted file mode 100644
index 7f987e78f..000000000
--- a/website/docs/services/s3/buckets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: buckets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - buckets_list_only
-  - s3
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>buckets</code> in a region or regions, for all properties use <a href="/services/s3/buckets/"><code>buckets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>buckets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::S3::Bucket&#96;&#96; resource creates an Amazon S3 bucket in the same AWS Region where you create the AWS CloudFormation stack.<br />To control how AWS CloudFormation handles the bucket when the stack is deleted, you can set a deletion policy for your bucket. You can choose to &#42;retain&#42; the bucket or to &#42;delete&#42; the bucket. For more information, see &#91;DeletionPolicy Attribute&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html).<br />You can only delete empty buckets. Deletion fails for buckets that have contents.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3.buckets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "bucket_name",
-    "type": "string",
-    "description": "A name for the bucket. If you don't specify a name, AWS CloudFormation generates a unique ID and uses that ID for the bucket name. The bucket name must contain only lowercase letters, numbers, periods (.), and dashes (-) and must follow &#91;Amazon S3 bucket restrictions and limitations&#93;(https://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html). For more information, see &#91;Rules for naming Amazon S3 buckets&#93;(https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html) in the &#42;Amazon S3 User Guide&#42;. <br />If you specify a name, you can't perform updates that require replacement of this resource. You can perform updates that require no or some interruption. If you need to replace the resource, specify a new name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>buckets</code> in a region.
-```sql
-SELECT
-region,
-bucket_name
-FROM awscc.s3.buckets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>buckets_list_only</code> resource, see <a href="/services/s3/buckets/#permissions"><code>buckets</code></a>
-
diff --git a/website/docs/services/s3/index.md b/website/docs/services/s3/index.md
index 2748516f1..5238af172 100644
--- a/website/docs/services/s3/index.md
+++ b/website/docs/services/s3/index.md
@@ -20,7 +20,7 @@ The s3 service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>19</b></span><br />
+<span>total resources:&nbsp;<b>10</b></span><br />
 </div>
 </div>
 
@@ -31,24 +31,15 @@ The s3 service documentation.
 <div class="providerDocColumn">
 <a href="/services/s3/access_grants/">access_grants</a><br />
 <a href="/services/s3/access_grants_instances/">access_grants_instances</a><br />
-<a href="/services/s3/access_grants_instances_list_only/">access_grants_instances_list_only</a><br />
-<a href="/services/s3/access_grants_list_only/">access_grants_list_only</a><br />
 <a href="/services/s3/access_grants_locations/">access_grants_locations</a><br />
-<a href="/services/s3/access_grants_locations_list_only/">access_grants_locations_list_only</a><br />
 <a href="/services/s3/access_points/">access_points</a><br />
-<a href="/services/s3/access_points_list_only/">access_points_list_only</a><br />
-<a href="/services/s3/bucket_policies/">bucket_policies</a><br />
-<a href="/services/s3/bucket_policies_list_only/">bucket_policies_list_only</a>
+<a href="/services/s3/bucket_policies/">bucket_policies</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/s3/buckets/">buckets</a><br />
-<a href="/services/s3/buckets_list_only/">buckets_list_only</a><br />
 <a href="/services/s3/multi_region_access_point_policies/">multi_region_access_point_policies</a><br />
 <a href="/services/s3/multi_region_access_points/">multi_region_access_points</a><br />
-<a href="/services/s3/multi_region_access_points_list_only/">multi_region_access_points_list_only</a><br />
 <a href="/services/s3/storage_lens/">storage_lens</a><br />
-<a href="/services/s3/storage_lens_groups/">storage_lens_groups</a><br />
-<a href="/services/s3/storage_lens_groups_list_only/">storage_lens_groups_list_only</a><br />
-<a href="/services/s3/storage_lens_list_only/">storage_lens_list_only</a>
+<a href="/services/s3/storage_lens_groups/">storage_lens_groups</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/s3/multi_region_access_point_policies/index.md b/website/docs/services/s3/multi_region_access_point_policies/index.md
index 153d9a956..746f22c61 100644
--- a/website/docs/services/s3/multi_region_access_point_policies/index.md
+++ b/website/docs/services/s3/multi_region_access_point_policies/index.md
@@ -180,6 +180,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3.multi_region_access_point_policies
+SET data__PatchDocument = string('{{ {
+    "Policy": policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<MrapName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3/multi_region_access_points/index.md b/website/docs/services/s3/multi_region_access_points/index.md
index b4472f29b..b994687d1 100644
--- a/website/docs/services/s3/multi_region_access_points/index.md
+++ b/website/docs/services/s3/multi_region_access_points/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>multi_region_access_point</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "public_access_block_configuration",
@@ -99,6 +108,23 @@ Creates, updates, deletes or gets a <code>multi_region_access_point</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name you want to assign to this Multi Region Access Point."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-multiregionaccesspoint.html"><code>AWS::S3::MultiRegionAccessPoint</code></a>.
 
@@ -108,26 +134,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>multi_region_access_points</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Regions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>multi_region_access_points</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>multi_region_access_points_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>multi_region_access_points</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +167,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>multi_region_access_point</code>.
 ```sql
 SELECT
@@ -148,6 +188,19 @@ name
 FROM awscc.s3.multi_region_access_points
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>multi_region_access_points</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.s3.multi_region_access_points_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -222,6 +275,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3/multi_region_access_points_list_only/index.md b/website/docs/services/s3/multi_region_access_points_list_only/index.md
deleted file mode 100644
index f2a6bf298..000000000
--- a/website/docs/services/s3/multi_region_access_points_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: multi_region_access_points_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - multi_region_access_points_list_only
-  - s3
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>multi_region_access_points</code> in a region or regions, for all properties use <a href="/services/s3/multi_region_access_points/"><code>multi_region_access_points</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>multi_region_access_points_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::S3::MultiRegionAccessPoint is an Amazon S3 resource type that dynamically routes S3 requests to easily satisfy geographic compliance requirements based on customer-defined routing policies.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3.multi_region_access_points_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name you want to assign to this Multi Region Access Point."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>multi_region_access_points</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.s3.multi_region_access_points_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>multi_region_access_points_list_only</code> resource, see <a href="/services/s3/multi_region_access_points/#permissions"><code>multi_region_access_points</code></a>
-
diff --git a/website/docs/services/s3/storage_lens/index.md b/website/docs/services/s3/storage_lens/index.md
index 88347a06d..569fa16a3 100644
--- a/website/docs/services/s3/storage_lens/index.md
+++ b/website/docs/services/s3/storage_lens/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>storage_len</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "storage_lens_configuration",
@@ -253,6 +262,214 @@ Creates, updates, deletes or gets a <code>storage_len</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "storage_lens_configuration",
+    "type": "object",
+    "description": "Specifies the details of Amazon S3 Storage Lens configuration.",
+    "children": [
+      {
+        "name": "account_level",
+        "type": "object",
+        "description": "Account-level metrics configurations.",
+        "children": [
+          {
+            "name": "advanced_data_protection_metrics",
+            "type": "object",
+            "description": "Enables advanced data protection metrics.",
+            "children": [
+              {
+                "name": "is_enabled",
+                "type": "boolean",
+                "description": "Specifies whether advanced data protection metrics are enabled or disabled."
+              }
+            ]
+          },
+          {
+            "name": "storage_lens_group_level",
+            "type": "object",
+            "description": "Specifies the details of Amazon S3 Storage Lens Group configuration.",
+            "children": [
+              {
+                "name": "storage_lens_group_selection_criteria",
+                "type": "object",
+                "description": "Selection criteria for Storage Lens Group level metrics"
+              }
+            ]
+          },
+          {
+            "name": "activity_metrics",
+            "type": "object",
+            "description": "Enables activity metrics.",
+            "children": [
+              {
+                "name": "is_enabled",
+                "type": "boolean",
+                "description": "Specifies whether activity metrics are enabled or disabled."
+              }
+            ]
+          },
+          {
+            "name": "bucket_level",
+            "type": "object",
+            "description": "Bucket-level metrics configurations.",
+            "children": [
+              {
+                "name": "prefix_level",
+                "type": "object",
+                "description": "Prefix-level metrics configurations."
+              },
+              {
+                "name": "advanced_cost_optimization_metrics",
+                "type": "object",
+                "description": "Enables advanced cost optimization metrics."
+              },
+              {
+                "name": "detailed_status_codes_metrics",
+                "type": "object",
+                "description": "Enables detailed status codes metrics."
+              }
+            ]
+          },
+          {
+            "name": "advanced_cost_optimization_metrics",
+            "type": "object",
+            "description": "Enables advanced cost optimization metrics.",
+            "children": [
+              {
+                "name": "is_enabled",
+                "type": "boolean",
+                "description": "Specifies whether advanced cost optimization metrics are enabled or disabled."
+              }
+            ]
+          },
+          {
+            "name": "detailed_status_codes_metrics",
+            "type": "object",
+            "description": "Enables detailed status codes metrics.",
+            "children": [
+              {
+                "name": "is_enabled",
+                "type": "boolean",
+                "description": "Specifies whether detailed status codes metrics are enabled or disabled."
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "exclude",
+        "type": "object",
+        "description": "S3 buckets and Regions to include/exclude in the Amazon S3 Storage Lens configuration.",
+        "children": [
+          {
+            "name": "regions",
+            "type": "array",
+            "description": ""
+          },
+          {
+            "name": "buckets",
+            "type": "array",
+            "description": ""
+          }
+        ]
+      },
+      {
+        "name": "is_enabled",
+        "type": "boolean",
+        "description": "Specifies whether the Amazon S3 Storage Lens configuration is enabled or disabled."
+      },
+      {
+        "name": "aws_org",
+        "type": "object",
+        "description": "The AWS Organizations ARN to use in the Amazon S3 Storage Lens configuration.",
+        "children": [
+          {
+            "name": "arn",
+            "type": "string",
+            "description": "The Amazon Resource Name (ARN) of the specified resource."
+          }
+        ]
+      },
+      {
+        "name": "id",
+        "type": "string",
+        "description": "The ID that identifies the Amazon S3 Storage Lens configuration."
+      },
+      {
+        "name": "storage_lens_arn",
+        "type": "string",
+        "description": "The ARN for the Amazon S3 Storage Lens configuration."
+      },
+      {
+        "name": "data_export",
+        "type": "object",
+        "description": "Specifies how Amazon S3 Storage Lens metrics should be exported.",
+        "children": [
+          {
+            "name": "s3_bucket_destination",
+            "type": "object",
+            "description": "S3 bucket destination settings for the Amazon S3 Storage Lens metrics export.",
+            "children": [
+              {
+                "name": "output_schema_version",
+                "type": "string",
+                "description": "The version of the output schema to use when exporting Amazon S3 Storage Lens metrics."
+              },
+              {
+                "name": "format",
+                "type": "string",
+                "description": "Specifies the file format to use when exporting Amazon S3 Storage Lens metrics export."
+              },
+              {
+                "name": "account_id",
+                "type": "string",
+                "description": "The AWS account ID that owns the destination S3 bucket."
+              },
+              {
+                "name": "prefix",
+                "type": "string",
+                "description": "The prefix to use for Amazon S3 Storage Lens export."
+              },
+              {
+                "name": "encryption",
+                "type": "object",
+                "description": "Configures the server-side encryption for Amazon S3 Storage Lens report files with either S3-managed keys (SSE-S3) or KMS-managed keys (SSE-KMS)."
+              },
+              {
+                "name": "arn",
+                "type": "string",
+                "description": "The ARN of the bucket to which Amazon S3 Storage Lens exports will be placed."
+              }
+            ]
+          },
+          {
+            "name": "cloud_watch_metrics",
+            "type": "object",
+            "description": "CloudWatch metrics settings for the Amazon S3 Storage Lens metrics export.",
+            "children": [
+              {
+                "name": "is_enabled",
+                "type": "boolean",
+                "description": "Specifies whether CloudWatch metrics are enabled or disabled."
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-storagelen.html"><code>AWS::S3::StorageLens</code></a>.
 
@@ -262,31 +479,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>storage_lens</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="StorageLensConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>storage_lens</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>storage_lens</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>storage_lens_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>storage_lens</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -295,6 +518,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>storage_len</code>.
 ```sql
 SELECT
@@ -304,6 +536,19 @@ tags
 FROM awscc.s3.storage_lens
 WHERE region = 'us-east-1' AND data__Identifier = '<StorageLensConfiguration/Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>storage_lens</code> in a region.
+```sql
+SELECT
+region,
+storage_lens_configuration/id
+FROM awscc.s3.storage_lens_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -418,6 +663,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3.storage_lens
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<StorageLensConfiguration/Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3/storage_lens_groups/index.md b/website/docs/services/s3/storage_lens_groups/index.md
index a2f500cc4..f6853ab23 100644
--- a/website/docs/services/s3/storage_lens_groups/index.md
+++ b/website/docs/services/s3/storage_lens_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>storage_lens_group</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -145,6 +154,23 @@ Creates, updates, deletes or gets a <code>storage_lens_group</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name that identifies the Amazon S3 Storage Lens Group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-storagelensgroup.html"><code>AWS::S3::StorageLensGroup</code></a>.
 
@@ -154,31 +180,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>storage_lens_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Filter, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>storage_lens_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>storage_lens_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>storage_lens_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>storage_lens_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -187,6 +219,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>storage_lens_group</code>.
 ```sql
 SELECT
@@ -198,6 +239,19 @@ tags
 FROM awscc.s3.storage_lens_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>storage_lens_groups</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.s3.storage_lens_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -294,6 +348,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3.storage_lens_groups
+SET data__PatchDocument = string('{{ {
+    "Filter": filter,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3/storage_lens_groups_list_only/index.md b/website/docs/services/s3/storage_lens_groups_list_only/index.md
deleted file mode 100644
index 31539de18..000000000
--- a/website/docs/services/s3/storage_lens_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: storage_lens_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - storage_lens_groups_list_only
-  - s3
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>storage_lens_groups</code> in a region or regions, for all properties use <a href="/services/s3/storage_lens_groups/"><code>storage_lens_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>storage_lens_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::S3::StorageLensGroup resource is an Amazon S3 resource type that you can use to create Storage Lens Group.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3.storage_lens_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name that identifies the Amazon S3 Storage Lens Group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>storage_lens_groups</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.s3.storage_lens_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>storage_lens_groups_list_only</code> resource, see <a href="/services/s3/storage_lens_groups/#permissions"><code>storage_lens_groups</code></a>
-
diff --git a/website/docs/services/s3/storage_lens_list_only/index.md b/website/docs/services/s3/storage_lens_list_only/index.md
deleted file mode 100644
index 18072f278..000000000
--- a/website/docs/services/s3/storage_lens_list_only/index.md
+++ /dev/null
@@ -1,271 +0,0 @@
----
-title: storage_lens_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - storage_lens_list_only
-  - s3
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>storage_lens</code> in a region or regions, for all properties use <a href="/services/s3/storage_lens/"><code>storage_lens</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>storage_lens_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::S3::StorageLens resource is an Amazon S3 resource type that you can use to create Storage Lens configurations.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3.storage_lens_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "storage_lens_configuration",
-    "type": "object",
-    "description": "Specifies the details of Amazon S3 Storage Lens configuration.",
-    "children": [
-      {
-        "name": "account_level",
-        "type": "object",
-        "description": "Account-level metrics configurations.",
-        "children": [
-          {
-            "name": "advanced_data_protection_metrics",
-            "type": "object",
-            "description": "Enables advanced data protection metrics.",
-            "children": [
-              {
-                "name": "is_enabled",
-                "type": "boolean",
-                "description": "Specifies whether advanced data protection metrics are enabled or disabled."
-              }
-            ]
-          },
-          {
-            "name": "storage_lens_group_level",
-            "type": "object",
-            "description": "Specifies the details of Amazon S3 Storage Lens Group configuration.",
-            "children": [
-              {
-                "name": "storage_lens_group_selection_criteria",
-                "type": "object",
-                "description": "Selection criteria for Storage Lens Group level metrics"
-              }
-            ]
-          },
-          {
-            "name": "activity_metrics",
-            "type": "object",
-            "description": "Enables activity metrics.",
-            "children": [
-              {
-                "name": "is_enabled",
-                "type": "boolean",
-                "description": "Specifies whether activity metrics are enabled or disabled."
-              }
-            ]
-          },
-          {
-            "name": "bucket_level",
-            "type": "object",
-            "description": "Bucket-level metrics configurations.",
-            "children": [
-              {
-                "name": "prefix_level",
-                "type": "object",
-                "description": "Prefix-level metrics configurations."
-              },
-              {
-                "name": "advanced_cost_optimization_metrics",
-                "type": "object",
-                "description": "Enables advanced cost optimization metrics."
-              },
-              {
-                "name": "detailed_status_codes_metrics",
-                "type": "object",
-                "description": "Enables detailed status codes metrics."
-              }
-            ]
-          },
-          {
-            "name": "advanced_cost_optimization_metrics",
-            "type": "object",
-            "description": "Enables advanced cost optimization metrics.",
-            "children": [
-              {
-                "name": "is_enabled",
-                "type": "boolean",
-                "description": "Specifies whether advanced cost optimization metrics are enabled or disabled."
-              }
-            ]
-          },
-          {
-            "name": "detailed_status_codes_metrics",
-            "type": "object",
-            "description": "Enables detailed status codes metrics.",
-            "children": [
-              {
-                "name": "is_enabled",
-                "type": "boolean",
-                "description": "Specifies whether detailed status codes metrics are enabled or disabled."
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "name": "exclude",
-        "type": "object",
-        "description": "S3 buckets and Regions to include/exclude in the Amazon S3 Storage Lens configuration.",
-        "children": [
-          {
-            "name": "regions",
-            "type": "array",
-            "description": ""
-          },
-          {
-            "name": "buckets",
-            "type": "array",
-            "description": ""
-          }
-        ]
-      },
-      {
-        "name": "is_enabled",
-        "type": "boolean",
-        "description": "Specifies whether the Amazon S3 Storage Lens configuration is enabled or disabled."
-      },
-      {
-        "name": "aws_org",
-        "type": "object",
-        "description": "The AWS Organizations ARN to use in the Amazon S3 Storage Lens configuration.",
-        "children": [
-          {
-            "name": "arn",
-            "type": "string",
-            "description": "The Amazon Resource Name (ARN) of the specified resource."
-          }
-        ]
-      },
-      {
-        "name": "id",
-        "type": "string",
-        "description": "The ID that identifies the Amazon S3 Storage Lens configuration."
-      },
-      {
-        "name": "storage_lens_arn",
-        "type": "string",
-        "description": "The ARN for the Amazon S3 Storage Lens configuration."
-      },
-      {
-        "name": "data_export",
-        "type": "object",
-        "description": "Specifies how Amazon S3 Storage Lens metrics should be exported.",
-        "children": [
-          {
-            "name": "s3_bucket_destination",
-            "type": "object",
-            "description": "S3 bucket destination settings for the Amazon S3 Storage Lens metrics export.",
-            "children": [
-              {
-                "name": "output_schema_version",
-                "type": "string",
-                "description": "The version of the output schema to use when exporting Amazon S3 Storage Lens metrics."
-              },
-              {
-                "name": "format",
-                "type": "string",
-                "description": "Specifies the file format to use when exporting Amazon S3 Storage Lens metrics export."
-              },
-              {
-                "name": "account_id",
-                "type": "string",
-                "description": "The AWS account ID that owns the destination S3 bucket."
-              },
-              {
-                "name": "prefix",
-                "type": "string",
-                "description": "The prefix to use for Amazon S3 Storage Lens export."
-              },
-              {
-                "name": "encryption",
-                "type": "object",
-                "description": "Configures the server-side encryption for Amazon S3 Storage Lens report files with either S3-managed keys (SSE-S3) or KMS-managed keys (SSE-KMS)."
-              },
-              {
-                "name": "arn",
-                "type": "string",
-                "description": "The ARN of the bucket to which Amazon S3 Storage Lens exports will be placed."
-              }
-            ]
-          },
-          {
-            "name": "cloud_watch_metrics",
-            "type": "object",
-            "description": "CloudWatch metrics settings for the Amazon S3 Storage Lens metrics export.",
-            "children": [
-              {
-                "name": "is_enabled",
-                "type": "boolean",
-                "description": "Specifies whether CloudWatch metrics are enabled or disabled."
-              }
-            ]
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>storage_lens</code> in a region.
-```sql
-SELECT
-region,
-storage_lens_configuration/id
-FROM awscc.s3.storage_lens_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>storage_lens_list_only</code> resource, see <a href="/services/s3/storage_lens/#permissions"><code>storage_lens</code></a>
-
diff --git a/website/docs/services/s3express/access_points/index.md b/website/docs/services/s3express/access_points/index.md
index fc4f0c40b..f81bf29ad 100644
--- a/website/docs/services/s3express/access_points/index.md
+++ b/website/docs/services/s3express/access_points/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>access_point</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -143,6 +152,23 @@ Creates, updates, deletes or gets an <code>access_point</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name you want to assign to this Access Point. If you don't specify a name, AWS CloudFormation generates a unique ID and uses that ID for the access point name. For directory buckets, the access point name must consist of a base name that you provide and suffix that includes the ZoneID (AWS Availability Zone or Local Zone) of your bucket location, followed by --xa-s3."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3express-accesspoint.html"><code>AWS::S3Express::AccessPoint</code></a>.
 
@@ -152,31 +178,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Bucket, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>access_points_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -185,6 +217,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>access_point</code>.
 ```sql
 SELECT
@@ -202,6 +243,19 @@ tags
 FROM awscc.s3express.access_points
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>access_points</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.s3express.access_points_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -301,6 +355,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3express.access_points
+SET data__PatchDocument = string('{{ {
+    "PublicAccessBlockConfiguration": public_access_block_configuration,
+    "Scope": scope,
+    "Policy": policy,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3express/access_points_list_only/index.md b/website/docs/services/s3express/access_points_list_only/index.md
deleted file mode 100644
index 23dcf5620..000000000
--- a/website/docs/services/s3express/access_points_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: access_points_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - access_points_list_only
-  - s3express
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>access_points</code> in a region or regions, for all properties use <a href="/services/s3express/access_points/"><code>access_points</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>access_points_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::S3Express::AccessPoint resource is an Amazon S3 resource type that you can use to access buckets.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3express.access_points_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name you want to assign to this Access Point. If you don't specify a name, AWS CloudFormation generates a unique ID and uses that ID for the access point name. For directory buckets, the access point name must consist of a base name that you provide and suffix that includes the ZoneID (AWS Availability Zone or Local Zone) of your bucket location, followed by --xa-s3."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>access_points</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.s3express.access_points_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>access_points_list_only</code> resource, see <a href="/services/s3express/access_points/#permissions"><code>access_points</code></a>
-
diff --git a/website/docs/services/s3express/bucket_policies/index.md b/website/docs/services/s3express/bucket_policies/index.md
index bcdb4974d..4b713c6c7 100644
--- a/website/docs/services/s3express/bucket_policies/index.md
+++ b/website/docs/services/s3express/bucket_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>bucket_policy</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "bucket",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>bucket_policy</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "bucket",
+    "type": "string",
+    "description": "The name of the S3 directory bucket to which the policy applies."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3express-bucketpolicy.html"><code>AWS::S3Express::BucketPolicy</code></a>.
 
@@ -59,31 +85,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>bucket_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Bucket, PolicyDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>bucket_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>bucket_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>bucket_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>bucket_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +124,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>bucket_policy</code>.
 ```sql
 SELECT
@@ -101,6 +142,19 @@ policy_document
 FROM awscc.s3express.bucket_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Bucket>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>bucket_policies</code> in a region.
+```sql
+SELECT
+region,
+bucket
+FROM awscc.s3express.bucket_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -167,6 +221,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3express.bucket_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyDocument": policy_document
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Bucket>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3express/bucket_policies_list_only/index.md b/website/docs/services/s3express/bucket_policies_list_only/index.md
deleted file mode 100644
index d1135a10b..000000000
--- a/website/docs/services/s3express/bucket_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: bucket_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - bucket_policies_list_only
-  - s3express
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>bucket_policies</code> in a region or regions, for all properties use <a href="/services/s3express/bucket_policies/"><code>bucket_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>bucket_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::S3Express::BucketPolicy.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3express.bucket_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "bucket",
-    "type": "string",
-    "description": "The name of the S3 directory bucket to which the policy applies."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>bucket_policies</code> in a region.
-```sql
-SELECT
-region,
-bucket
-FROM awscc.s3express.bucket_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>bucket_policies_list_only</code> resource, see <a href="/services/s3express/bucket_policies/#permissions"><code>bucket_policies</code></a>
-
diff --git a/website/docs/services/s3express/directory_buckets/index.md b/website/docs/services/s3express/directory_buckets/index.md
index 4f356ee79..0eec6321d 100644
--- a/website/docs/services/s3express/directory_buckets/index.md
+++ b/website/docs/services/s3express/directory_buckets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>directory_bucket</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "bucket_name",
@@ -174,6 +183,23 @@ Creates, updates, deletes or gets a <code>directory_bucket</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "bucket_name",
+    "type": "string",
+    "description": "Specifies a name for the bucket. The bucket name must contain only lowercase letters, numbers, and hyphens (-). A directory bucket name must be unique in the chosen Availability Zone or Local Zone. The bucket name must also follow the format 'bucket&#95;base&#95;name--zone&#95;id--x-s3'. The zone&#95;id can be the ID of an Availability Zone or a Local Zone. If you don't specify a name, AWS CloudFormation generates a unique physical ID and uses that ID for the bucket name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3express-directorybucket.html"><code>AWS::S3Express::DirectoryBucket</code></a>.
 
@@ -183,31 +209,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>directory_buckets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="LocationName, DataRedundancy, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>directory_buckets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>directory_buckets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>directory_buckets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>directory_buckets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -216,6 +248,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>directory_bucket</code>.
 ```sql
 SELECT
@@ -231,6 +272,19 @@ tags
 FROM awscc.s3express.directory_buckets
 WHERE region = 'us-east-1' AND data__Identifier = '<BucketName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>directory_buckets</code> in a region.
+```sql
+SELECT
+region,
+bucket_name
+FROM awscc.s3express.directory_buckets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -329,6 +383,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3express.directory_buckets
+SET data__PatchDocument = string('{{ {
+    "BucketEncryption": bucket_encryption,
+    "LifecycleConfiguration": lifecycle_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<BucketName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3express/directory_buckets_list_only/index.md b/website/docs/services/s3express/directory_buckets_list_only/index.md
deleted file mode 100644
index 54987e7e5..000000000
--- a/website/docs/services/s3express/directory_buckets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: directory_buckets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - directory_buckets_list_only
-  - s3express
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>directory_buckets</code> in a region or regions, for all properties use <a href="/services/s3express/directory_buckets/"><code>directory_buckets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>directory_buckets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::S3Express::DirectoryBucket.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3express.directory_buckets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "bucket_name",
-    "type": "string",
-    "description": "Specifies a name for the bucket. The bucket name must contain only lowercase letters, numbers, and hyphens (-). A directory bucket name must be unique in the chosen Availability Zone or Local Zone. The bucket name must also follow the format 'bucket&#95;base&#95;name--zone&#95;id--x-s3'. The zone&#95;id can be the ID of an Availability Zone or a Local Zone. If you don't specify a name, AWS CloudFormation generates a unique physical ID and uses that ID for the bucket name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>directory_buckets</code> in a region.
-```sql
-SELECT
-region,
-bucket_name
-FROM awscc.s3express.directory_buckets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>directory_buckets_list_only</code> resource, see <a href="/services/s3express/directory_buckets/#permissions"><code>directory_buckets</code></a>
-
diff --git a/website/docs/services/s3express/index.md b/website/docs/services/s3express/index.md
index def0abb48..b1c18f9e4 100644
--- a/website/docs/services/s3express/index.md
+++ b/website/docs/services/s3express/index.md
@@ -20,7 +20,7 @@ The s3express service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The s3express service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/s3express/access_points/">access_points</a><br />
-<a href="/services/s3express/access_points_list_only/">access_points_list_only</a><br />
 <a href="/services/s3express/bucket_policies/">bucket_policies</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/s3express/bucket_policies_list_only/">bucket_policies_list_only</a><br />
-<a href="/services/s3express/directory_buckets/">directory_buckets</a><br />
-<a href="/services/s3express/directory_buckets_list_only/">directory_buckets_list_only</a>
+<a href="/services/s3express/directory_buckets/">directory_buckets</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/s3objectlambda/access_point_policies/index.md b/website/docs/services/s3objectlambda/access_point_policies/index.md
index d1386318c..c86f7c127 100644
--- a/website/docs/services/s3objectlambda/access_point_policies/index.md
+++ b/website/docs/services/s3objectlambda/access_point_policies/index.md
@@ -162,6 +162,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3objectlambda.access_point_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyDocument": policy_document
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ObjectLambdaAccessPoint>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3objectlambda/access_points/index.md b/website/docs/services/s3objectlambda/access_points/index.md
index 9cbee8aa8..426573909 100644
--- a/website/docs/services/s3objectlambda/access_points/index.md
+++ b/website/docs/services/s3objectlambda/access_points/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>access_point</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -150,6 +159,23 @@ Creates, updates, deletes or gets an <code>access_point</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name you want to assign to this Object lambda Access Point."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3objectlambda-accesspoint.html"><code>AWS::S3ObjectLambda::AccessPoint</code></a>.
 
@@ -159,31 +185,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ObjectLambdaConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>access_points_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -192,6 +224,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>access_point</code>.
 ```sql
 SELECT
@@ -206,6 +247,19 @@ object_lambda_configuration
 FROM awscc.s3objectlambda.access_points
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>access_points</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.s3objectlambda.access_points_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -278,6 +332,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3objectlambda.access_points
+SET data__PatchDocument = string('{{ {
+    "ObjectLambdaConfiguration": object_lambda_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3objectlambda/access_points_list_only/index.md b/website/docs/services/s3objectlambda/access_points_list_only/index.md
deleted file mode 100644
index c99c78041..000000000
--- a/website/docs/services/s3objectlambda/access_points_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: access_points_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - access_points_list_only
-  - s3objectlambda
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>access_points</code> in a region or regions, for all properties use <a href="/services/s3objectlambda/access_points/"><code>access_points</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>access_points_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::S3ObjectLambda::AccessPoint resource is an Amazon S3ObjectLambda resource type that you can use to add computation to S3 actions</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3objectlambda.access_points_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name you want to assign to this Object lambda Access Point."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>access_points</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.s3objectlambda.access_points_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>access_points_list_only</code> resource, see <a href="/services/s3objectlambda/access_points/#permissions"><code>access_points</code></a>
-
diff --git a/website/docs/services/s3objectlambda/index.md b/website/docs/services/s3objectlambda/index.md
index 3c01a863e..107b5f15b 100644
--- a/website/docs/services/s3objectlambda/index.md
+++ b/website/docs/services/s3objectlambda/index.md
@@ -20,7 +20,7 @@ The s3objectlambda service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>3</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,10 +29,9 @@ The s3objectlambda service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/s3objectlambda/access_point_policies/">access_point_policies</a><br />
-<a href="/services/s3objectlambda/access_points/">access_points</a>
+<a href="/services/s3objectlambda/access_point_policies/">access_point_policies</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/s3objectlambda/access_points_list_only/">access_points_list_only</a>
+<a href="/services/s3objectlambda/access_points/">access_points</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/s3outposts/access_points/index.md b/website/docs/services/s3outposts/access_points/index.md
index e14fdc403..85c5e2ffe 100644
--- a/website/docs/services/s3outposts/access_points/index.md
+++ b/website/docs/services/s3outposts/access_points/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>access_point</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets an <code>access_point</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the specified AccessPoint."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-accesspoint.html"><code>AWS::S3Outposts::AccessPoint</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Bucket, Name, VpcConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>access_points_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>access_points</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>access_point</code>.
 ```sql
 SELECT
@@ -126,6 +167,19 @@ policy
 FROM awscc.s3outposts.access_points
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>access_points</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.s3outposts.access_points_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -203,6 +257,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3outposts.access_points
+SET data__PatchDocument = string('{{ {
+    "Policy": policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3outposts/access_points_list_only/index.md b/website/docs/services/s3outposts/access_points_list_only/index.md
deleted file mode 100644
index d848c207c..000000000
--- a/website/docs/services/s3outposts/access_points_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: access_points_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - access_points_list_only
-  - s3outposts
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>access_points</code> in a region or regions, for all properties use <a href="/services/s3outposts/access_points/"><code>access_points</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>access_points_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type Definition for AWS::S3Outposts::AccessPoint</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3outposts.access_points_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the specified AccessPoint."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>access_points</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.s3outposts.access_points_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>access_points_list_only</code> resource, see <a href="/services/s3outposts/access_points/#permissions"><code>access_points</code></a>
-
diff --git a/website/docs/services/s3outposts/bucket_policies/index.md b/website/docs/services/s3outposts/bucket_policies/index.md
index de0a1818d..08a717c55 100644
--- a/website/docs/services/s3outposts/bucket_policies/index.md
+++ b/website/docs/services/s3outposts/bucket_policies/index.md
@@ -162,6 +162,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3outposts.bucket_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyDocument": policy_document
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Bucket>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3outposts/buckets/index.md b/website/docs/services/s3outposts/buckets/index.md
index acd31fa46..fa3a9fad8 100644
--- a/website/docs/services/s3outposts/buckets/index.md
+++ b/website/docs/services/s3outposts/buckets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>bucket</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -140,6 +149,23 @@ Creates, updates, deletes or gets a <code>bucket</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the specified bucket."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-bucket.html"><code>AWS::S3Outposts::Bucket</code></a>.
 
@@ -149,31 +175,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>buckets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="BucketName, OutpostId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>buckets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>buckets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>buckets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>buckets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -182,6 +214,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>bucket</code>.
 ```sql
 SELECT
@@ -194,6 +235,19 @@ lifecycle_configuration
 FROM awscc.s3outposts.buckets
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>buckets</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.s3outposts.buckets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -283,6 +337,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3outposts.buckets
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "LifecycleConfiguration": lifecycle_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3outposts/buckets_list_only/index.md b/website/docs/services/s3outposts/buckets_list_only/index.md
deleted file mode 100644
index 286e28afd..000000000
--- a/website/docs/services/s3outposts/buckets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: buckets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - buckets_list_only
-  - s3outposts
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>buckets</code> in a region or regions, for all properties use <a href="/services/s3outposts/buckets/"><code>buckets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>buckets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type Definition for AWS::S3Outposts::Bucket</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3outposts.buckets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the specified bucket."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>buckets</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.s3outposts.buckets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>buckets_list_only</code> resource, see <a href="/services/s3outposts/buckets/#permissions"><code>buckets</code></a>
-
diff --git a/website/docs/services/s3outposts/endpoints/index.md b/website/docs/services/s3outposts/endpoints/index.md
index 40ac307ef..a908ec80e 100644
--- a/website/docs/services/s3outposts/endpoints/index.md
+++ b/website/docs/services/s3outposts/endpoints/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>endpoint</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -119,6 +128,23 @@ Creates, updates, deletes or gets an <code>endpoint</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the endpoint."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-endpoint.html"><code>AWS::S3Outposts::Endpoint</code></a>.
 
@@ -128,26 +154,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>endpoints</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="OutpostId, SecurityGroupId, SubnetId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>endpoints</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>endpoints_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>endpoints</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -156,6 +187,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>endpoint</code>.
 ```sql
 SELECT
@@ -175,6 +215,19 @@ failed_reason
 FROM awscc.s3outposts.endpoints
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>endpoints</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.s3outposts.endpoints_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -261,6 +314,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3outposts/endpoints_list_only/index.md b/website/docs/services/s3outposts/endpoints_list_only/index.md
deleted file mode 100644
index 919f90d68..000000000
--- a/website/docs/services/s3outposts/endpoints_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: endpoints_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - endpoints_list_only
-  - s3outposts
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>endpoints</code> in a region or regions, for all properties use <a href="/services/s3outposts/endpoints/"><code>endpoints</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>endpoints_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type Definition for AWS::S3Outposts::Endpoint</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3outposts.endpoints_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the endpoint."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>endpoints</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.s3outposts.endpoints_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>endpoints_list_only</code> resource, see <a href="/services/s3outposts/endpoints/#permissions"><code>endpoints</code></a>
-
diff --git a/website/docs/services/s3outposts/index.md b/website/docs/services/s3outposts/index.md
index f55f0e162..3f10daa14 100644
--- a/website/docs/services/s3outposts/index.md
+++ b/website/docs/services/s3outposts/index.md
@@ -20,7 +20,7 @@ The s3outposts service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>7</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,13 +30,10 @@ The s3outposts service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/s3outposts/access_points/">access_points</a><br />
-<a href="/services/s3outposts/access_points_list_only/">access_points_list_only</a><br />
-<a href="/services/s3outposts/bucket_policies/">bucket_policies</a><br />
-<a href="/services/s3outposts/buckets/">buckets</a>
+<a href="/services/s3outposts/bucket_policies/">bucket_policies</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/s3outposts/buckets_list_only/">buckets_list_only</a><br />
-<a href="/services/s3outposts/endpoints/">endpoints</a><br />
-<a href="/services/s3outposts/endpoints_list_only/">endpoints_list_only</a>
+<a href="/services/s3outposts/buckets/">buckets</a><br />
+<a href="/services/s3outposts/endpoints/">endpoints</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/s3tables/index.md b/website/docs/services/s3tables/index.md
index d7a32fe95..495f8fd01 100644
--- a/website/docs/services/s3tables/index.md
+++ b/website/docs/services/s3tables/index.md
@@ -20,7 +20,7 @@ The s3tables service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The s3tables service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/s3tables/table_bucket_policies/">table_bucket_policies</a><br />
-<a href="/services/s3tables/table_bucket_policies_list_only/">table_bucket_policies_list_only</a><br />
-<a href="/services/s3tables/table_buckets/">table_buckets</a><br />
-<a href="/services/s3tables/table_buckets_list_only/">table_buckets_list_only</a>
+<a href="/services/s3tables/table_buckets/">table_buckets</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/s3tables/table_policies/">table_policies</a><br />
-<a href="/services/s3tables/table_policies_list_only/">table_policies_list_only</a><br />
-<a href="/services/s3tables/tables/">tables</a><br />
-<a href="/services/s3tables/tables_list_only/">tables_list_only</a>
+<a href="/services/s3tables/tables/">tables</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/s3tables/table_bucket_policies/index.md b/website/docs/services/s3tables/table_bucket_policies/index.md
index daa5fb45a..1ba8ad6ce 100644
--- a/website/docs/services/s3tables/table_bucket_policies/index.md
+++ b/website/docs/services/s3tables/table_bucket_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>table_bucket_policy</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "resource_policy",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>table_bucket_policy</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "table_bucket_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the specified table bucket."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3tables-tablebucketpolicy.html"><code>AWS::S3Tables::TableBucketPolicy</code></a>.
 
@@ -59,31 +85,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>table_bucket_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResourcePolicy, TableBucketARN, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>table_bucket_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>table_bucket_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>table_bucket_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>table_bucket_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +124,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>table_bucket_policy</code>.
 ```sql
 SELECT
@@ -101,6 +142,19 @@ table_bucket_arn
 FROM awscc.s3tables.table_bucket_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<TableBucketARN>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>table_bucket_policies</code> in a region.
+```sql
+SELECT
+region,
+table_bucket_arn
+FROM awscc.s3tables.table_bucket_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -167,6 +221,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3tables.table_bucket_policies
+SET data__PatchDocument = string('{{ {
+    "ResourcePolicy": resource_policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TableBucketARN>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3tables/table_bucket_policies_list_only/index.md b/website/docs/services/s3tables/table_bucket_policies_list_only/index.md
deleted file mode 100644
index ebb3a0f31..000000000
--- a/website/docs/services/s3tables/table_bucket_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: table_bucket_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - table_bucket_policies_list_only
-  - s3tables
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>table_bucket_policies</code> in a region or regions, for all properties use <a href="/services/s3tables/table_bucket_policies/"><code>table_bucket_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>table_bucket_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Applies an IAM resource policy to a table bucket.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3tables.table_bucket_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "table_bucket_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the specified table bucket."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>table_bucket_policies</code> in a region.
-```sql
-SELECT
-region,
-table_bucket_arn
-FROM awscc.s3tables.table_bucket_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>table_bucket_policies_list_only</code> resource, see <a href="/services/s3tables/table_bucket_policies/#permissions"><code>table_bucket_policies</code></a>
-
diff --git a/website/docs/services/s3tables/table_buckets/index.md b/website/docs/services/s3tables/table_buckets/index.md
index ab34d0987..56951538c 100644
--- a/website/docs/services/s3tables/table_buckets/index.md
+++ b/website/docs/services/s3tables/table_buckets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>table_bucket</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "table_bucket_arn",
@@ -89,6 +98,23 @@ Creates, updates, deletes or gets a <code>table_bucket</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "table_bucket_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the specified table bucket."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3tables-tablebucket.html"><code>AWS::S3Tables::TableBucket</code></a>.
 
@@ -98,31 +124,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>table_buckets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TableBucketName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>table_buckets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>table_buckets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>table_buckets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>table_buckets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -131,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>table_bucket</code>.
 ```sql
 SELECT
@@ -142,6 +183,19 @@ encryption_configuration
 FROM awscc.s3tables.table_buckets
 WHERE region = 'us-east-1' AND data__Identifier = '<TableBucketARN>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>table_buckets</code> in a region.
+```sql
+SELECT
+region,
+table_bucket_arn
+FROM awscc.s3tables.table_buckets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -215,6 +269,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3tables.table_buckets
+SET data__PatchDocument = string('{{ {
+    "UnreferencedFileRemoval": unreferenced_file_removal,
+    "EncryptionConfiguration": encryption_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TableBucketARN>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3tables/table_buckets_list_only/index.md b/website/docs/services/s3tables/table_buckets_list_only/index.md
deleted file mode 100644
index 7f3991fa9..000000000
--- a/website/docs/services/s3tables/table_buckets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: table_buckets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - table_buckets_list_only
-  - s3tables
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>table_buckets</code> in a region or regions, for all properties use <a href="/services/s3tables/table_buckets/"><code>table_buckets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>table_buckets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates an Amazon S3 Tables table bucket in the same AWS Region where you create the AWS CloudFormation stack.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3tables.table_buckets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "table_bucket_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the specified table bucket."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>table_buckets</code> in a region.
-```sql
-SELECT
-region,
-table_bucket_arn
-FROM awscc.s3tables.table_buckets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>table_buckets_list_only</code> resource, see <a href="/services/s3tables/table_buckets/#permissions"><code>table_buckets</code></a>
-
diff --git a/website/docs/services/s3tables/table_policies/index.md b/website/docs/services/s3tables/table_policies/index.md
index 625156f62..199f24abc 100644
--- a/website/docs/services/s3tables/table_policies/index.md
+++ b/website/docs/services/s3tables/table_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>table_policy</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "resource_policy",
@@ -65,6 +74,23 @@ Creates, updates, deletes or gets a <code>table_policy</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "table_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the specified table."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3tables-tablepolicy.html"><code>AWS::S3Tables::TablePolicy</code></a>.
 
@@ -74,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>table_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TableARN, ResourcePolicy, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>table_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>table_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>table_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>table_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>table_policy</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ namespace
 FROM awscc.s3tables.table_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<TableARN>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>table_policies</code> in a region.
+```sql
+SELECT
+region,
+table_arn
+FROM awscc.s3tables.table_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -185,6 +239,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3tables.table_policies
+SET data__PatchDocument = string('{{ {
+    "ResourcePolicy": resource_policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TableARN>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3tables/table_policies_list_only/index.md b/website/docs/services/s3tables/table_policies_list_only/index.md
deleted file mode 100644
index 78050ccc8..000000000
--- a/website/docs/services/s3tables/table_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: table_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - table_policies_list_only
-  - s3tables
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>table_policies</code> in a region or regions, for all properties use <a href="/services/s3tables/table_policies/"><code>table_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>table_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::S3Tables::TablePolicy</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3tables.table_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "table_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the specified table."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>table_policies</code> in a region.
-```sql
-SELECT
-region,
-table_arn
-FROM awscc.s3tables.table_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>table_policies_list_only</code> resource, see <a href="/services/s3tables/table_policies/#permissions"><code>table_policies</code></a>
-
diff --git a/website/docs/services/s3tables/tables/index.md b/website/docs/services/s3tables/tables/index.md
index 2a4484bea..83ca137ba 100644
--- a/website/docs/services/s3tables/tables/index.md
+++ b/website/docs/services/s3tables/tables/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>table</code> resource or lists <code>t
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "without_metadata",
@@ -155,6 +164,23 @@ Creates, updates, deletes or gets a <code>table</code> resource or lists <code>t
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "table_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the specified table."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3tables-table.html"><code>AWS::S3Tables::Table</code></a>.
 
@@ -164,31 +190,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TableBucketARN, Namespace, TableName, OpenTableFormat, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>tables_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -197,6 +229,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>table</code>.
 ```sql
 SELECT
@@ -215,6 +256,19 @@ snapshot_management
 FROM awscc.s3tables.tables
 WHERE region = 'us-east-1' AND data__Identifier = '<TableARN>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>tables</code> in a region.
+```sql
+SELECT
+region,
+table_arn
+FROM awscc.s3tables.tables_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -319,6 +373,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.s3tables.tables
+SET data__PatchDocument = string('{{ {
+    "Compaction": compaction,
+    "Namespace": namespace,
+    "TableName": table_name,
+    "SnapshotManagement": snapshot_management
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TableARN>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/s3tables/tables_list_only/index.md b/website/docs/services/s3tables/tables_list_only/index.md
deleted file mode 100644
index fa3790950..000000000
--- a/website/docs/services/s3tables/tables_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: tables_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - tables_list_only
-  - s3tables
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>tables</code> in a region or regions, for all properties use <a href="/services/s3tables/tables/"><code>tables</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>tables_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::S3Tables::Table</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3tables.tables_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "table_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the specified table."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>tables</code> in a region.
-```sql
-SELECT
-region,
-table_arn
-FROM awscc.s3tables.tables_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>tables_list_only</code> resource, see <a href="/services/s3tables/tables/#permissions"><code>tables</code></a>
-
diff --git a/website/docs/services/sagemaker/app_image_configs/index.md b/website/docs/services/sagemaker/app_image_configs/index.md
index 6f85f2a0f..d9955d80b 100644
--- a/website/docs/services/sagemaker/app_image_configs/index.md
+++ b/website/docs/services/sagemaker/app_image_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>app_image_config</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "app_image_config_arn",
@@ -195,6 +204,23 @@ Creates, updates, deletes or gets an <code>app_image_config</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "app_image_config_name",
+    "type": "string",
+    "description": "The Name of the AppImageConfig."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-appimageconfig.html"><code>AWS::SageMaker::AppImageConfig</code></a>.
 
@@ -204,31 +230,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>app_image_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AppImageConfigName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>app_image_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>app_image_configs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>app_image_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>app_image_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -237,6 +269,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>app_image_config</code>.
 ```sql
 SELECT
@@ -250,6 +291,19 @@ tags
 FROM awscc.sagemaker.app_image_configs
 WHERE region = 'us-east-1' AND data__Identifier = '<AppImageConfigName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>app_image_configs</code> in a region.
+```sql
+SELECT
+region,
+app_image_config_name
+FROM awscc.sagemaker.app_image_configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -344,6 +398,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.app_image_configs
+SET data__PatchDocument = string('{{ {
+    "KernelGatewayImageConfig": kernel_gateway_image_config,
+    "JupyterLabAppImageConfig": jupyter_lab_app_image_config,
+    "CodeEditorAppImageConfig": code_editor_app_image_config,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AppImageConfigName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/app_image_configs_list_only/index.md b/website/docs/services/sagemaker/app_image_configs_list_only/index.md
deleted file mode 100644
index 90c28ebdf..000000000
--- a/website/docs/services/sagemaker/app_image_configs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: app_image_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - app_image_configs_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>app_image_configs</code> in a region or regions, for all properties use <a href="/services/sagemaker/app_image_configs/"><code>app_image_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>app_image_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::AppImageConfig</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.app_image_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "app_image_config_name",
-    "type": "string",
-    "description": "The Name of the AppImageConfig."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>app_image_configs</code> in a region.
-```sql
-SELECT
-region,
-app_image_config_name
-FROM awscc.sagemaker.app_image_configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>app_image_configs_list_only</code> resource, see <a href="/services/sagemaker/app_image_configs/#permissions"><code>app_image_configs</code></a>
-
diff --git a/website/docs/services/sagemaker/apps/index.md b/website/docs/services/sagemaker/apps/index.md
index cb54ec2ce..0c1ee9052 100644
--- a/website/docs/services/sagemaker/apps/index.md
+++ b/website/docs/services/sagemaker/apps/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>app</code> resource or lists <code>ap
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "app_arn",
@@ -119,6 +128,38 @@ Creates, updates, deletes or gets an <code>app</code> resource or lists <code>ap
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "app_name",
+    "type": "string",
+    "description": "The name of the app."
+  },
+  {
+    "name": "app_type",
+    "type": "string",
+    "description": "The type of app."
+  },
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": "The domain ID."
+  },
+  {
+    "name": "user_profile_name",
+    "type": "string",
+    "description": "The user profile name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-app.html"><code>AWS::SageMaker::App</code></a>.
 
@@ -128,31 +169,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>apps</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AppName, AppType, DomainId, UserProfileName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>apps</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>apps</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>apps_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>apps</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +208,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>app</code>.
 ```sql
 SELECT
@@ -177,6 +233,22 @@ recovery_mode
 FROM awscc.sagemaker.apps
 WHERE region = 'us-east-1' AND data__Identifier = '<AppName>|<AppType>|<DomainId>|<UserProfileName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>apps</code> in a region.
+```sql
+SELECT
+region,
+app_name,
+app_type,
+domain_id,
+user_profile_name
+FROM awscc.sagemaker.apps_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -273,6 +345,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.apps
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "RecoveryMode": recovery_mode
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AppName>|<AppType>|<DomainId>|<UserProfileName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/apps_list_only/index.md b/website/docs/services/sagemaker/apps_list_only/index.md
deleted file mode 100644
index 1e3c5f0ae..000000000
--- a/website/docs/services/sagemaker/apps_list_only/index.md
+++ /dev/null
@@ -1,98 +0,0 @@
----
-title: apps_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - apps_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>apps</code> in a region or regions, for all properties use <a href="/services/sagemaker/apps/"><code>apps</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>apps_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::App</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.apps_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "app_name",
-    "type": "string",
-    "description": "The name of the app."
-  },
-  {
-    "name": "app_type",
-    "type": "string",
-    "description": "The type of app."
-  },
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": "The domain ID."
-  },
-  {
-    "name": "user_profile_name",
-    "type": "string",
-    "description": "The user profile name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>apps</code> in a region.
-```sql
-SELECT
-region,
-app_name,
-app_type,
-domain_id,
-user_profile_name
-FROM awscc.sagemaker.apps_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>apps_list_only</code> resource, see <a href="/services/sagemaker/apps/#permissions"><code>apps</code></a>
-
diff --git a/website/docs/services/sagemaker/clusters/index.md b/website/docs/services/sagemaker/clusters/index.md
index 24c66eba1..f9a48731e 100644
--- a/website/docs/services/sagemaker/clusters/index.md
+++ b/website/docs/services/sagemaker/clusters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "cluster_arn",
@@ -334,6 +343,23 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the HyperPod Cluster."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-cluster.html"><code>AWS::SageMaker::Cluster</code></a>.
 
@@ -343,31 +369,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>clusters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>clusters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -376,6 +408,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>cluster</code>.
 ```sql
 SELECT
@@ -397,6 +438,19 @@ tags
 FROM awscc.sagemaker.clusters
 WHERE region = 'us-east-1' AND data__Identifier = '<ClusterArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>clusters</code> in a region.
+```sql
+SELECT
+region,
+cluster_arn
+FROM awscc.sagemaker.clusters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -554,6 +608,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.clusters
+SET data__PatchDocument = string('{{ {
+    "NodeRecovery": node_recovery,
+    "ClusterRole": cluster_role,
+    "NodeProvisioningMode": node_provisioning_mode,
+    "AutoScaling": auto_scaling,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ClusterArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/clusters_list_only/index.md b/website/docs/services/sagemaker/clusters_list_only/index.md
deleted file mode 100644
index 5d4ae8ecb..000000000
--- a/website/docs/services/sagemaker/clusters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: clusters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - clusters_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>clusters</code> in a region or regions, for all properties use <a href="/services/sagemaker/clusters/"><code>clusters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>clusters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::Cluster</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.clusters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "cluster_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the HyperPod Cluster."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>clusters</code> in a region.
-```sql
-SELECT
-region,
-cluster_arn
-FROM awscc.sagemaker.clusters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>clusters_list_only</code> resource, see <a href="/services/sagemaker/clusters/#permissions"><code>clusters</code></a>
-
diff --git a/website/docs/services/sagemaker/data_quality_job_definitions/index.md b/website/docs/services/sagemaker/data_quality_job_definitions/index.md
index 2f98f48d3..09421ccba 100644
--- a/website/docs/services/sagemaker/data_quality_job_definitions/index.md
+++ b/website/docs/services/sagemaker/data_quality_job_definitions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_quality_job_definition</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "job_definition_arn",
@@ -364,6 +373,23 @@ Creates, updates, deletes or gets a <code>data_quality_job_definition</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "job_definition_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of job definition."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-dataqualityjobdefinition.html"><code>AWS::SageMaker::DataQualityJobDefinition</code></a>.
 
@@ -373,26 +399,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_quality_job_definitions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DataQualityAppSpecification, DataQualityJobInput, DataQualityJobOutputConfig, JobResources, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_quality_job_definitions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_quality_job_definitions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_quality_job_definitions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -401,6 +432,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_quality_job_definition</code>.
 ```sql
 SELECT
@@ -421,6 +461,19 @@ creation_time
 FROM awscc.sagemaker.data_quality_job_definitions
 WHERE region = 'us-east-1' AND data__Identifier = '<JobDefinitionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_quality_job_definitions</code> in a region.
+```sql
+SELECT
+region,
+job_definition_arn
+FROM awscc.sagemaker.data_quality_job_definitions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -581,6 +634,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/data_quality_job_definitions_list_only/index.md b/website/docs/services/sagemaker/data_quality_job_definitions_list_only/index.md
deleted file mode 100644
index f7d39ccaa..000000000
--- a/website/docs/services/sagemaker/data_quality_job_definitions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: data_quality_job_definitions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_quality_job_definitions_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_quality_job_definitions</code> in a region or regions, for all properties use <a href="/services/sagemaker/data_quality_job_definitions/"><code>data_quality_job_definitions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_quality_job_definitions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::DataQualityJobDefinition</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.data_quality_job_definitions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "job_definition_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of job definition."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_quality_job_definitions</code> in a region.
-```sql
-SELECT
-region,
-job_definition_arn
-FROM awscc.sagemaker.data_quality_job_definitions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_quality_job_definitions_list_only</code> resource, see <a href="/services/sagemaker/data_quality_job_definitions/#permissions"><code>data_quality_job_definitions</code></a>
-
diff --git a/website/docs/services/sagemaker/device_fleets/index.md b/website/docs/services/sagemaker/device_fleets/index.md
index 51a16a143..2d2ac3ba0 100644
--- a/website/docs/services/sagemaker/device_fleets/index.md
+++ b/website/docs/services/sagemaker/device_fleets/index.md
@@ -222,6 +222,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.device_fleets
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "OutputConfig": output_config,
+    "RoleArn": role_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DeviceFleetName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/devices/index.md b/website/docs/services/sagemaker/devices/index.md
index f6d02f666..7e2db0719 100644
--- a/website/docs/services/sagemaker/devices/index.md
+++ b/website/docs/services/sagemaker/devices/index.md
@@ -212,6 +212,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.devices
+SET data__PatchDocument = string('{{ {
+    "DeviceFleetName": device_fleet_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Device/DeviceName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/endpoints/index.md b/website/docs/services/sagemaker/endpoints/index.md
index eae4cf342..15b4fada4 100644
--- a/website/docs/services/sagemaker/endpoints/index.md
+++ b/website/docs/services/sagemaker/endpoints/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>endpoint</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "deployment_config",
@@ -193,6 +202,23 @@ Creates, updates, deletes or gets an <code>endpoint</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "endpoint_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the endpoint."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpoint.html"><code>AWS::SageMaker::Endpoint</code></a>.
 
@@ -202,31 +228,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>endpoints</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EndpointConfigName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>endpoints</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>endpoints</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>endpoints_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>endpoints</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -235,6 +267,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>endpoint</code>.
 ```sql
 SELECT
@@ -250,6 +291,19 @@ tags
 FROM awscc.sagemaker.endpoints
 WHERE region = 'us-east-1' AND data__Identifier = '<EndpointArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>endpoints</code> in a region.
+```sql
+SELECT
+region,
+endpoint_arn
+FROM awscc.sagemaker.endpoints_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -351,6 +405,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.endpoints
+SET data__PatchDocument = string('{{ {
+    "DeploymentConfig": deployment_config,
+    "EndpointConfigName": endpoint_config_name,
+    "ExcludeRetainedVariantProperties": exclude_retained_variant_properties,
+    "RetainAllVariantProperties": retain_all_variant_properties,
+    "RetainDeploymentConfig": retain_deployment_config,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<EndpointArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/endpoints_list_only/index.md b/website/docs/services/sagemaker/endpoints_list_only/index.md
deleted file mode 100644
index 6eb7c3c0f..000000000
--- a/website/docs/services/sagemaker/endpoints_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: endpoints_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - endpoints_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>endpoints</code> in a region or regions, for all properties use <a href="/services/sagemaker/endpoints/"><code>endpoints</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>endpoints_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::Endpoint</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.endpoints_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "endpoint_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the endpoint."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>endpoints</code> in a region.
-```sql
-SELECT
-region,
-endpoint_arn
-FROM awscc.sagemaker.endpoints_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>endpoints_list_only</code> resource, see <a href="/services/sagemaker/endpoints/#permissions"><code>endpoints</code></a>
-
diff --git a/website/docs/services/sagemaker/feature_groups/index.md b/website/docs/services/sagemaker/feature_groups/index.md
index efe0ed46e..69c8f55d4 100644
--- a/website/docs/services/sagemaker/feature_groups/index.md
+++ b/website/docs/services/sagemaker/feature_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>feature_group</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "feature_group_name",
@@ -233,6 +242,23 @@ Creates, updates, deletes or gets a <code>feature_group</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "feature_group_name",
+    "type": "string",
+    "description": "The Name of the FeatureGroup."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-featuregroup.html"><code>AWS::SageMaker::FeatureGroup</code></a>.
 
@@ -242,31 +268,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>feature_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FeatureGroupName, RecordIdentifierFeatureName, EventTimeFeatureName, FeatureDefinitions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>feature_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>feature_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>feature_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>feature_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -275,6 +307,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>feature_group</code>.
 ```sql
 SELECT
@@ -294,6 +335,19 @@ tags
 FROM awscc.sagemaker.feature_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<FeatureGroupName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>feature_groups</code> in a region.
+```sql
+SELECT
+region,
+feature_group_name
+FROM awscc.sagemaker.feature_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -419,6 +473,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.feature_groups
+SET data__PatchDocument = string('{{ {
+    "FeatureDefinitions": feature_definitions,
+    "ThroughputConfig": throughput_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FeatureGroupName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/feature_groups_list_only/index.md b/website/docs/services/sagemaker/feature_groups_list_only/index.md
deleted file mode 100644
index 7e36e652a..000000000
--- a/website/docs/services/sagemaker/feature_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: feature_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - feature_groups_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>feature_groups</code> in a region or regions, for all properties use <a href="/services/sagemaker/feature_groups/"><code>feature_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>feature_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::FeatureGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.feature_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "feature_group_name",
-    "type": "string",
-    "description": "The Name of the FeatureGroup."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>feature_groups</code> in a region.
-```sql
-SELECT
-region,
-feature_group_name
-FROM awscc.sagemaker.feature_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>feature_groups_list_only</code> resource, see <a href="/services/sagemaker/feature_groups/#permissions"><code>feature_groups</code></a>
-
diff --git a/website/docs/services/sagemaker/image_versions/index.md b/website/docs/services/sagemaker/image_versions/index.md
index 4942b9ae0..5af4a0189 100644
--- a/website/docs/services/sagemaker/image_versions/index.md
+++ b/website/docs/services/sagemaker/image_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>image_version</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "image_name",
@@ -115,6 +124,28 @@ Creates, updates, deletes or gets an <code>image_version</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "image_version_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the image version."
+  },
+  {
+    "name": "version",
+    "type": "integer",
+    "description": "The version number of the image version."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-imageversion.html"><code>AWS::SageMaker::ImageVersion</code></a>.
 
@@ -124,31 +155,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>image_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ImageName, BaseImage, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>image_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>image_versions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>image_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>image_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -157,6 +194,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>image_version</code>.
 ```sql
 SELECT
@@ -179,6 +225,19 @@ release_notes
 FROM awscc.sagemaker.image_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<ImageVersionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>image_versions</code> in a region.
+```sql
+SELECT
+region,
+image_version_arn
+FROM awscc.sagemaker.image_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -282,6 +341,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.image_versions
+SET data__PatchDocument = string('{{ {
+    "Alias": alias,
+    "Aliases": aliases,
+    "VendorGuidance": vendor_guidance,
+    "JobType": job_type,
+    "MLFramework": ml_framework,
+    "ProgrammingLang": programming_lang,
+    "Processor": processor,
+    "Horovod": horovod,
+    "ReleaseNotes": release_notes
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ImageVersionArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/image_versions_list_only/index.md b/website/docs/services/sagemaker/image_versions_list_only/index.md
deleted file mode 100644
index eeab7acb5..000000000
--- a/website/docs/services/sagemaker/image_versions_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: image_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - image_versions_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>image_versions</code> in a region or regions, for all properties use <a href="/services/sagemaker/image_versions/"><code>image_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>image_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::ImageVersion</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.image_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "image_version_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the image version."
-  },
-  {
-    "name": "version",
-    "type": "integer",
-    "description": "The version number of the image version."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>image_versions</code> in a region.
-```sql
-SELECT
-region,
-image_version_arn
-FROM awscc.sagemaker.image_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>image_versions_list_only</code> resource, see <a href="/services/sagemaker/image_versions/#permissions"><code>image_versions</code></a>
-
diff --git a/website/docs/services/sagemaker/images/index.md b/website/docs/services/sagemaker/images/index.md
index b082156ab..869a5d5df 100644
--- a/website/docs/services/sagemaker/images/index.md
+++ b/website/docs/services/sagemaker/images/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>image</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "image_name",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets an <code>image</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "image_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the parent image."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-image.html"><code>AWS::SageMaker::Image</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>images</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ImageName, ImageRoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>images</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>images</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>images_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>images</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>image</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.sagemaker.images
 WHERE region = 'us-east-1' AND data__Identifier = '<ImageArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>images</code> in a region.
+```sql
+SELECT
+region,
+image_arn
+FROM awscc.sagemaker.images_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +271,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.images
+SET data__PatchDocument = string('{{ {
+    "ImageRoleArn": image_role_arn,
+    "ImageDisplayName": image_display_name,
+    "ImageDescription": image_description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ImageArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/images_list_only/index.md b/website/docs/services/sagemaker/images_list_only/index.md
deleted file mode 100644
index dabee88c6..000000000
--- a/website/docs/services/sagemaker/images_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: images_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - images_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>images</code> in a region or regions, for all properties use <a href="/services/sagemaker/images/"><code>images</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>images_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::Image</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.images_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "image_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the parent image."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>images</code> in a region.
-```sql
-SELECT
-region,
-image_arn
-FROM awscc.sagemaker.images_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>images_list_only</code> resource, see <a href="/services/sagemaker/images/#permissions"><code>images</code></a>
-
diff --git a/website/docs/services/sagemaker/index.md b/website/docs/services/sagemaker/index.md
index e66d756c4..6e094aec2 100644
--- a/website/docs/services/sagemaker/index.md
+++ b/website/docs/services/sagemaker/index.md
@@ -20,7 +20,7 @@ The sagemaker service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>50</b></span><br />
+<span>total resources:&nbsp;<b>26</b></span><br />
 </div>
 </div>
 
@@ -30,56 +30,32 @@ The sagemaker service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/sagemaker/app_image_configs/">app_image_configs</a><br />
-<a href="/services/sagemaker/app_image_configs_list_only/">app_image_configs_list_only</a><br />
 <a href="/services/sagemaker/apps/">apps</a><br />
-<a href="/services/sagemaker/apps_list_only/">apps_list_only</a><br />
 <a href="/services/sagemaker/clusters/">clusters</a><br />
-<a href="/services/sagemaker/clusters_list_only/">clusters_list_only</a><br />
 <a href="/services/sagemaker/data_quality_job_definitions/">data_quality_job_definitions</a><br />
-<a href="/services/sagemaker/data_quality_job_definitions_list_only/">data_quality_job_definitions_list_only</a><br />
 <a href="/services/sagemaker/device_fleets/">device_fleets</a><br />
 <a href="/services/sagemaker/devices/">devices</a><br />
 <a href="/services/sagemaker/endpoints/">endpoints</a><br />
-<a href="/services/sagemaker/endpoints_list_only/">endpoints_list_only</a><br />
 <a href="/services/sagemaker/feature_groups/">feature_groups</a><br />
-<a href="/services/sagemaker/feature_groups_list_only/">feature_groups_list_only</a><br />
 <a href="/services/sagemaker/image_versions/">image_versions</a><br />
-<a href="/services/sagemaker/image_versions_list_only/">image_versions_list_only</a><br />
 <a href="/services/sagemaker/images/">images</a><br />
-<a href="/services/sagemaker/images_list_only/">images_list_only</a><br />
 <a href="/services/sagemaker/inference_components/">inference_components</a><br />
-<a href="/services/sagemaker/inference_components_list_only/">inference_components_list_only</a><br />
 <a href="/services/sagemaker/inference_experiments/">inference_experiments</a><br />
-<a href="/services/sagemaker/inference_experiments_list_only/">inference_experiments_list_only</a><br />
-<a href="/services/sagemaker/mlflow_tracking_servers/">mlflow_tracking_servers</a><br />
-<a href="/services/sagemaker/mlflow_tracking_servers_list_only/">mlflow_tracking_servers_list_only</a><br />
-<a href="/services/sagemaker/model_bias_job_definitions/">model_bias_job_definitions</a>
+<a href="/services/sagemaker/mlflow_tracking_servers/">mlflow_tracking_servers</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/sagemaker/model_bias_job_definitions_list_only/">model_bias_job_definitions_list_only</a><br />
+<a href="/services/sagemaker/model_bias_job_definitions/">model_bias_job_definitions</a><br />
 <a href="/services/sagemaker/model_explainability_job_definitions/">model_explainability_job_definitions</a><br />
-<a href="/services/sagemaker/model_explainability_job_definitions_list_only/">model_explainability_job_definitions_list_only</a><br />
 <a href="/services/sagemaker/model_package_groups/">model_package_groups</a><br />
-<a href="/services/sagemaker/model_package_groups_list_only/">model_package_groups_list_only</a><br />
 <a href="/services/sagemaker/model_packages/">model_packages</a><br />
-<a href="/services/sagemaker/model_packages_list_only/">model_packages_list_only</a><br />
 <a href="/services/sagemaker/model_quality_job_definitions/">model_quality_job_definitions</a><br />
-<a href="/services/sagemaker/model_quality_job_definitions_list_only/">model_quality_job_definitions_list_only</a><br />
 <a href="/services/sagemaker/monitoring_schedules/">monitoring_schedules</a><br />
-<a href="/services/sagemaker/monitoring_schedules_list_only/">monitoring_schedules_list_only</a><br />
 <a href="/services/sagemaker/partner_apps/">partner_apps</a><br />
-<a href="/services/sagemaker/partner_apps_list_only/">partner_apps_list_only</a><br />
 <a href="/services/sagemaker/pipelines/">pipelines</a><br />
-<a href="/services/sagemaker/pipelines_list_only/">pipelines_list_only</a><br />
 <a href="/services/sagemaker/processing_jobs/">processing_jobs</a><br />
-<a href="/services/sagemaker/processing_jobs_list_only/">processing_jobs_list_only</a><br />
 <a href="/services/sagemaker/projects/">projects</a><br />
-<a href="/services/sagemaker/projects_list_only/">projects_list_only</a><br />
 <a href="/services/sagemaker/spaces/">spaces</a><br />
-<a href="/services/sagemaker/spaces_list_only/">spaces_list_only</a><br />
 <a href="/services/sagemaker/studio_lifecycle_configs/">studio_lifecycle_configs</a><br />
-<a href="/services/sagemaker/studio_lifecycle_configs_list_only/">studio_lifecycle_configs_list_only</a><br />
-<a href="/services/sagemaker/user_profiles/">user_profiles</a><br />
-<a href="/services/sagemaker/user_profiles_list_only/">user_profiles_list_only</a>
+<a href="/services/sagemaker/user_profiles/">user_profiles</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/sagemaker/inference_components/index.md b/website/docs/services/sagemaker/inference_components/index.md
index 1dd65e4ae..3c16433e1 100644
--- a/website/docs/services/sagemaker/inference_components/index.md
+++ b/website/docs/services/sagemaker/inference_components/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>inference_component</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "inference_component_arn",
@@ -259,6 +268,23 @@ Creates, updates, deletes or gets an <code>inference_component</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "inference_component_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the inference component"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-inferencecomponent.html"><code>AWS::SageMaker::InferenceComponent</code></a>.
 
@@ -268,31 +294,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>inference_components</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EndpointName, Specification, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>inference_components</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>inference_components</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>inference_components_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>inference_components</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -301,6 +333,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>inference_component</code>.
 ```sql
 SELECT
@@ -321,6 +362,19 @@ tags
 FROM awscc.sagemaker.inference_components
 WHERE region = 'us-east-1' AND data__Identifier = '<InferenceComponentArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>inference_components</code> in a region.
+```sql
+SELECT
+region,
+inference_component_arn
+FROM awscc.sagemaker.inference_components_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -444,6 +498,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.inference_components
+SET data__PatchDocument = string('{{ {
+    "InferenceComponentName": inference_component_name,
+    "EndpointArn": endpoint_arn,
+    "EndpointName": endpoint_name,
+    "VariantName": variant_name,
+    "DeploymentConfig": deployment_config,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InferenceComponentArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/inference_components_list_only/index.md b/website/docs/services/sagemaker/inference_components_list_only/index.md
deleted file mode 100644
index bc77fa626..000000000
--- a/website/docs/services/sagemaker/inference_components_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: inference_components_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - inference_components_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>inference_components</code> in a region or regions, for all properties use <a href="/services/sagemaker/inference_components/"><code>inference_components</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>inference_components_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::InferenceComponent</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.inference_components_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "inference_component_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the inference component"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>inference_components</code> in a region.
-```sql
-SELECT
-region,
-inference_component_arn
-FROM awscc.sagemaker.inference_components_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>inference_components_list_only</code> resource, see <a href="/services/sagemaker/inference_components/#permissions"><code>inference_components</code></a>
-
diff --git a/website/docs/services/sagemaker/inference_experiments/index.md b/website/docs/services/sagemaker/inference_experiments/index.md
index a78761ab7..e13c341a2 100644
--- a/website/docs/services/sagemaker/inference_experiments/index.md
+++ b/website/docs/services/sagemaker/inference_experiments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>inference_experiment</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -260,6 +269,23 @@ Creates, updates, deletes or gets an <code>inference_experiment</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name for the inference experiment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-inferenceexperiment.html"><code>AWS::SageMaker::InferenceExperiment</code></a>.
 
@@ -269,31 +295,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>inference_experiments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Type, RoleArn, EndpointName, ModelVariants, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>inference_experiments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>inference_experiments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>inference_experiments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>inference_experiments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -302,6 +334,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>inference_experiment</code>.
 ```sql
 SELECT
@@ -327,6 +368,19 @@ desired_state
 FROM awscc.sagemaker.inference_experiments
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>inference_experiments</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.sagemaker.inference_experiments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -465,6 +519,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.inference_experiments
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Schedule": schedule,
+    "DataStorageConfig": data_storage_config,
+    "ModelVariants": model_variants,
+    "ShadowModeConfig": shadow_mode_config,
+    "Tags": tags,
+    "StatusReason": status_reason,
+    "DesiredState": desired_state
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/inference_experiments_list_only/index.md b/website/docs/services/sagemaker/inference_experiments_list_only/index.md
deleted file mode 100644
index 8c6d301f4..000000000
--- a/website/docs/services/sagemaker/inference_experiments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: inference_experiments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - inference_experiments_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>inference_experiments</code> in a region or regions, for all properties use <a href="/services/sagemaker/inference_experiments/"><code>inference_experiments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>inference_experiments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::InferenceExperiment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.inference_experiments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name for the inference experiment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>inference_experiments</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.sagemaker.inference_experiments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>inference_experiments_list_only</code> resource, see <a href="/services/sagemaker/inference_experiments/#permissions"><code>inference_experiments</code></a>
-
diff --git a/website/docs/services/sagemaker/mlflow_tracking_servers/index.md b/website/docs/services/sagemaker/mlflow_tracking_servers/index.md
index a693a832e..0a9449e06 100644
--- a/website/docs/services/sagemaker/mlflow_tracking_servers/index.md
+++ b/website/docs/services/sagemaker/mlflow_tracking_servers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>mlflow_tracking_server</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "tracking_server_name",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>mlflow_tracking_server</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "tracking_server_name",
+    "type": "string",
+    "description": "The name of the MLFlow Tracking Server."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-mlflowtrackingserver.html"><code>AWS::SageMaker::MlflowTrackingServer</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>mlflow_tracking_servers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TrackingServerName, ArtifactStoreUri, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>mlflow_tracking_servers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>mlflow_tracking_servers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>mlflow_tracking_servers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>mlflow_tracking_servers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>mlflow_tracking_server</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ tags
 FROM awscc.sagemaker.mlflow_tracking_servers
 WHERE region = 'us-east-1' AND data__Identifier = '<TrackingServerName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>mlflow_tracking_servers</code> in a region.
+```sql
+SELECT
+region,
+tracking_server_name
+FROM awscc.sagemaker.mlflow_tracking_servers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -249,6 +303,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.mlflow_tracking_servers
+SET data__PatchDocument = string('{{ {
+    "TrackingServerSize": tracking_server_size,
+    "MlflowVersion": mlflow_version,
+    "RoleArn": role_arn,
+    "ArtifactStoreUri": artifact_store_uri,
+    "AutomaticModelRegistration": automatic_model_registration,
+    "WeeklyMaintenanceWindowStart": weekly_maintenance_window_start,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TrackingServerName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/mlflow_tracking_servers_list_only/index.md b/website/docs/services/sagemaker/mlflow_tracking_servers_list_only/index.md
deleted file mode 100644
index fff0e5e44..000000000
--- a/website/docs/services/sagemaker/mlflow_tracking_servers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: mlflow_tracking_servers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - mlflow_tracking_servers_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>mlflow_tracking_servers</code> in a region or regions, for all properties use <a href="/services/sagemaker/mlflow_tracking_servers/"><code>mlflow_tracking_servers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>mlflow_tracking_servers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::MlflowTrackingServer</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.mlflow_tracking_servers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "tracking_server_name",
-    "type": "string",
-    "description": "The name of the MLFlow Tracking Server."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>mlflow_tracking_servers</code> in a region.
-```sql
-SELECT
-region,
-tracking_server_name
-FROM awscc.sagemaker.mlflow_tracking_servers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>mlflow_tracking_servers_list_only</code> resource, see <a href="/services/sagemaker/mlflow_tracking_servers/#permissions"><code>mlflow_tracking_servers</code></a>
-
diff --git a/website/docs/services/sagemaker/model_bias_job_definitions/index.md b/website/docs/services/sagemaker/model_bias_job_definitions/index.md
index 2d8a11ed9..e433150c8 100644
--- a/website/docs/services/sagemaker/model_bias_job_definitions/index.md
+++ b/website/docs/services/sagemaker/model_bias_job_definitions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>model_bias_job_definition</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "job_definition_arn",
@@ -354,6 +363,23 @@ Creates, updates, deletes or gets a <code>model_bias_job_definition</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "job_definition_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of job definition."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelbiasjobdefinition.html"><code>AWS::SageMaker::ModelBiasJobDefinition</code></a>.
 
@@ -363,26 +389,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>model_bias_job_definitions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ModelBiasAppSpecification, ModelBiasJobInput, ModelBiasJobOutputConfig, JobResources, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>model_bias_job_definitions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>model_bias_job_definitions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>model_bias_job_definitions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -391,6 +422,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>model_bias_job_definition</code>.
 ```sql
 SELECT
@@ -411,6 +451,19 @@ creation_time
 FROM awscc.sagemaker.model_bias_job_definitions
 WHERE region = 'us-east-1' AND data__Identifier = '<JobDefinitionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>model_bias_job_definitions</code> in a region.
+```sql
+SELECT
+region,
+job_definition_arn
+FROM awscc.sagemaker.model_bias_job_definitions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -566,6 +619,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/model_bias_job_definitions_list_only/index.md b/website/docs/services/sagemaker/model_bias_job_definitions_list_only/index.md
deleted file mode 100644
index e8c00624f..000000000
--- a/website/docs/services/sagemaker/model_bias_job_definitions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: model_bias_job_definitions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - model_bias_job_definitions_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>model_bias_job_definitions</code> in a region or regions, for all properties use <a href="/services/sagemaker/model_bias_job_definitions/"><code>model_bias_job_definitions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>model_bias_job_definitions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::ModelBiasJobDefinition</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.model_bias_job_definitions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "job_definition_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of job definition."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>model_bias_job_definitions</code> in a region.
-```sql
-SELECT
-region,
-job_definition_arn
-FROM awscc.sagemaker.model_bias_job_definitions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>model_bias_job_definitions_list_only</code> resource, see <a href="/services/sagemaker/model_bias_job_definitions/#permissions"><code>model_bias_job_definitions</code></a>
-
diff --git a/website/docs/services/sagemaker/model_explainability_job_definitions/index.md b/website/docs/services/sagemaker/model_explainability_job_definitions/index.md
index a6de317cc..e1e6b912a 100644
--- a/website/docs/services/sagemaker/model_explainability_job_definitions/index.md
+++ b/website/docs/services/sagemaker/model_explainability_job_definitions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>model_explainability_job_definition</c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "job_definition_arn",
@@ -342,6 +351,23 @@ Creates, updates, deletes or gets a <code>model_explainability_job_definition</c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "job_definition_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of job definition."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelexplainabilityjobdefinition.html"><code>AWS::SageMaker::ModelExplainabilityJobDefinition</code></a>.
 
@@ -351,26 +377,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>model_explainability_job_definitions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ModelExplainabilityAppSpecification, ModelExplainabilityJobInput, ModelExplainabilityJobOutputConfig, JobResources, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>model_explainability_job_definitions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>model_explainability_job_definitions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>model_explainability_job_definitions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -379,6 +410,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>model_explainability_job_definition</code>.
 ```sql
 SELECT
@@ -399,6 +439,19 @@ creation_time
 FROM awscc.sagemaker.model_explainability_job_definitions
 WHERE region = 'us-east-1' AND data__Identifier = '<JobDefinitionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>model_explainability_job_definitions</code> in a region.
+```sql
+SELECT
+region,
+job_definition_arn
+FROM awscc.sagemaker.model_explainability_job_definitions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -552,6 +605,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/model_explainability_job_definitions_list_only/index.md b/website/docs/services/sagemaker/model_explainability_job_definitions_list_only/index.md
deleted file mode 100644
index 68e40dc6f..000000000
--- a/website/docs/services/sagemaker/model_explainability_job_definitions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: model_explainability_job_definitions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - model_explainability_job_definitions_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>model_explainability_job_definitions</code> in a region or regions, for all properties use <a href="/services/sagemaker/model_explainability_job_definitions/"><code>model_explainability_job_definitions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>model_explainability_job_definitions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::ModelExplainabilityJobDefinition</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.model_explainability_job_definitions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "job_definition_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of job definition."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>model_explainability_job_definitions</code> in a region.
-```sql
-SELECT
-region,
-job_definition_arn
-FROM awscc.sagemaker.model_explainability_job_definitions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>model_explainability_job_definitions_list_only</code> resource, see <a href="/services/sagemaker/model_explainability_job_definitions/#permissions"><code>model_explainability_job_definitions</code></a>
-
diff --git a/website/docs/services/sagemaker/model_package_groups/index.md b/website/docs/services/sagemaker/model_package_groups/index.md
index d88aba52a..5903c5c44 100644
--- a/website/docs/services/sagemaker/model_package_groups/index.md
+++ b/website/docs/services/sagemaker/model_package_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>model_package_group</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "tags",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>model_package_group</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "model_package_group_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the model package group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackagegroup.html"><code>AWS::SageMaker::ModelPackageGroup</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>model_package_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ModelPackageGroupName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>model_package_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>model_package_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>model_package_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>model_package_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>model_package_group</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ model_package_group_status
 FROM awscc.sagemaker.model_package_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<ModelPackageGroupArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>model_package_groups</code> in a region.
+```sql
+SELECT
+region,
+model_package_group_arn
+FROM awscc.sagemaker.model_package_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +271,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.model_package_groups
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "ModelPackageGroupPolicy": model_package_group_policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ModelPackageGroupArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/model_package_groups_list_only/index.md b/website/docs/services/sagemaker/model_package_groups_list_only/index.md
deleted file mode 100644
index 6c950ce45..000000000
--- a/website/docs/services/sagemaker/model_package_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: model_package_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - model_package_groups_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>model_package_groups</code> in a region or regions, for all properties use <a href="/services/sagemaker/model_package_groups/"><code>model_package_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>model_package_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::ModelPackageGroup</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.model_package_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "model_package_group_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the model package group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>model_package_groups</code> in a region.
-```sql
-SELECT
-region,
-model_package_group_arn
-FROM awscc.sagemaker.model_package_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>model_package_groups_list_only</code> resource, see <a href="/services/sagemaker/model_package_groups/#permissions"><code>model_package_groups</code></a>
-
diff --git a/website/docs/services/sagemaker/model_packages/index.md b/website/docs/services/sagemaker/model_packages/index.md
index 7f8c8797c..bc7b33573 100644
--- a/website/docs/services/sagemaker/model_packages/index.md
+++ b/website/docs/services/sagemaker/model_packages/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>model_package</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "tags",
@@ -818,6 +827,23 @@ Creates, updates, deletes or gets a <code>model_package</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "model_package_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the model package group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html"><code>AWS::SageMaker::ModelPackage</code></a>.
 
@@ -827,31 +853,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>model_packages</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>model_packages</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>model_packages</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>model_packages_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>model_packages</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -860,6 +892,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>model_package</code>.
 ```sql
 SELECT
@@ -897,6 +938,19 @@ security_config
 FROM awscc.sagemaker.model_packages
 WHERE region = 'us-east-1' AND data__Identifier = '<ModelPackageArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>model_packages</code> in a region.
+```sql
+SELECT
+region,
+model_package_arn
+FROM awscc.sagemaker.model_packages_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1223,6 +1277,32 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.model_packages
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "AdditionalInferenceSpecifications": additional_inference_specifications,
+    "CertifyForMarketplace": certify_for_marketplace,
+    "CustomerMetadataProperties": customer_metadata_properties,
+    "ModelApprovalStatus": model_approval_status,
+    "ModelPackageName": model_package_name,
+    "SkipModelValidation": skip_model_validation,
+    "ApprovalDescription": approval_description,
+    "LastModifiedTime": last_modified_time,
+    "ModelPackageVersion": model_package_version,
+    "AdditionalInferenceSpecificationsToAdd": additional_inference_specifications_to_add,
+    "ModelPackageStatusDetails": model_package_status_details,
+    "SourceUri": source_uri,
+    "ModelCard": model_card
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ModelPackageArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/model_packages_list_only/index.md b/website/docs/services/sagemaker/model_packages_list_only/index.md
deleted file mode 100644
index 9766d5f2b..000000000
--- a/website/docs/services/sagemaker/model_packages_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: model_packages_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - model_packages_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>model_packages</code> in a region or regions, for all properties use <a href="/services/sagemaker/model_packages/"><code>model_packages</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>model_packages_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::ModelPackage</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.model_packages_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "model_package_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the model package group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>model_packages</code> in a region.
-```sql
-SELECT
-region,
-model_package_arn
-FROM awscc.sagemaker.model_packages_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>model_packages_list_only</code> resource, see <a href="/services/sagemaker/model_packages/#permissions"><code>model_packages</code></a>
-
diff --git a/website/docs/services/sagemaker/model_quality_job_definitions/index.md b/website/docs/services/sagemaker/model_quality_job_definitions/index.md
index 5045ab264..0065d49de 100644
--- a/website/docs/services/sagemaker/model_quality_job_definitions/index.md
+++ b/website/docs/services/sagemaker/model_quality_job_definitions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>model_quality_job_definition</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "job_definition_arn",
@@ -369,6 +378,23 @@ Creates, updates, deletes or gets a <code>model_quality_job_definition</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "job_definition_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of job definition."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelqualityjobdefinition.html"><code>AWS::SageMaker::ModelQualityJobDefinition</code></a>.
 
@@ -378,26 +404,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>model_quality_job_definitions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ModelQualityAppSpecification, ModelQualityJobInput, ModelQualityJobOutputConfig, JobResources, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>model_quality_job_definitions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>model_quality_job_definitions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>model_quality_job_definitions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -406,6 +437,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>model_quality_job_definition</code>.
 ```sql
 SELECT
@@ -426,6 +466,19 @@ creation_time
 FROM awscc.sagemaker.model_quality_job_definitions
 WHERE region = 'us-east-1' AND data__Identifier = '<JobDefinitionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>model_quality_job_definitions</code> in a region.
+```sql
+SELECT
+region,
+job_definition_arn
+FROM awscc.sagemaker.model_quality_job_definitions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -587,6 +640,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/model_quality_job_definitions_list_only/index.md b/website/docs/services/sagemaker/model_quality_job_definitions_list_only/index.md
deleted file mode 100644
index 40f07d6ad..000000000
--- a/website/docs/services/sagemaker/model_quality_job_definitions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: model_quality_job_definitions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - model_quality_job_definitions_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>model_quality_job_definitions</code> in a region or regions, for all properties use <a href="/services/sagemaker/model_quality_job_definitions/"><code>model_quality_job_definitions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>model_quality_job_definitions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::ModelQualityJobDefinition</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.model_quality_job_definitions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "job_definition_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of job definition."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>model_quality_job_definitions</code> in a region.
-```sql
-SELECT
-region,
-job_definition_arn
-FROM awscc.sagemaker.model_quality_job_definitions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>model_quality_job_definitions_list_only</code> resource, see <a href="/services/sagemaker/model_quality_job_definitions/#permissions"><code>model_quality_job_definitions</code></a>
-
diff --git a/website/docs/services/sagemaker/monitoring_schedules/index.md b/website/docs/services/sagemaker/monitoring_schedules/index.md
index 933f15a13..587936bf9 100644
--- a/website/docs/services/sagemaker/monitoring_schedules/index.md
+++ b/website/docs/services/sagemaker/monitoring_schedules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>monitoring_schedule</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "monitoring_schedule_arn",
@@ -304,6 +313,23 @@ Creates, updates, deletes or gets a <code>monitoring_schedule</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "monitoring_schedule_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the monitoring schedule."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-monitoringschedule.html"><code>AWS::SageMaker::MonitoringSchedule</code></a>.
 
@@ -313,31 +339,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>monitoring_schedules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="MonitoringScheduleConfig, MonitoringScheduleName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>monitoring_schedules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>monitoring_schedules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>monitoring_schedules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>monitoring_schedules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -346,6 +378,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>monitoring_schedule</code>.
 ```sql
 SELECT
@@ -363,6 +404,19 @@ monitoring_schedule_status
 FROM awscc.sagemaker.monitoring_schedules
 WHERE region = 'us-east-1' AND data__Identifier = '<MonitoringScheduleArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>monitoring_schedules</code> in a region.
+```sql
+SELECT
+region,
+monitoring_schedule_arn
+FROM awscc.sagemaker.monitoring_schedules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -523,6 +577,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.monitoring_schedules
+SET data__PatchDocument = string('{{ {
+    "MonitoringScheduleConfig": monitoring_schedule_config,
+    "Tags": tags,
+    "EndpointName": endpoint_name,
+    "FailureReason": failure_reason,
+    "LastMonitoringExecutionSummary": last_monitoring_execution_summary,
+    "MonitoringScheduleStatus": monitoring_schedule_status
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<MonitoringScheduleArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/monitoring_schedules_list_only/index.md b/website/docs/services/sagemaker/monitoring_schedules_list_only/index.md
deleted file mode 100644
index e39900a74..000000000
--- a/website/docs/services/sagemaker/monitoring_schedules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: monitoring_schedules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - monitoring_schedules_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>monitoring_schedules</code> in a region or regions, for all properties use <a href="/services/sagemaker/monitoring_schedules/"><code>monitoring_schedules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>monitoring_schedules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::MonitoringSchedule</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.monitoring_schedules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "monitoring_schedule_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the monitoring schedule."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>monitoring_schedules</code> in a region.
-```sql
-SELECT
-region,
-monitoring_schedule_arn
-FROM awscc.sagemaker.monitoring_schedules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>monitoring_schedules_list_only</code> resource, see <a href="/services/sagemaker/monitoring_schedules/#permissions"><code>monitoring_schedules</code></a>
-
diff --git a/website/docs/services/sagemaker/partner_apps/index.md b/website/docs/services/sagemaker/partner_apps/index.md
index d35ab4417..65f2452c8 100644
--- a/website/docs/services/sagemaker/partner_apps/index.md
+++ b/website/docs/services/sagemaker/partner_apps/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>partner_app</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -136,6 +145,23 @@ Creates, updates, deletes or gets a <code>partner_app</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the created PartnerApp."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-partnerapp.html"><code>AWS::SageMaker::PartnerApp</code></a>.
 
@@ -145,31 +171,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>partner_apps</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Type, AuthType, ExecutionRoleArn, Tier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>partner_apps</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>partner_apps</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>partner_apps_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>partner_apps</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -178,6 +210,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>partner_app</code>.
 ```sql
 SELECT
@@ -198,6 +239,19 @@ tags
 FROM awscc.sagemaker.partner_apps
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>partner_apps</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.sagemaker.partner_apps_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -312,6 +366,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.partner_apps
+SET data__PatchDocument = string('{{ {
+    "Tier": tier,
+    "EnableIamSessionBasedIdentity": enable_iam_session_based_identity,
+    "ApplicationConfig": application_config,
+    "MaintenanceConfig": maintenance_config,
+    "ClientToken": client_token,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/partner_apps_list_only/index.md b/website/docs/services/sagemaker/partner_apps_list_only/index.md
deleted file mode 100644
index 2e3e043d3..000000000
--- a/website/docs/services/sagemaker/partner_apps_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: partner_apps_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - partner_apps_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>partner_apps</code> in a region or regions, for all properties use <a href="/services/sagemaker/partner_apps/"><code>partner_apps</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>partner_apps_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::PartnerApp</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.partner_apps_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the created PartnerApp."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>partner_apps</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.sagemaker.partner_apps_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>partner_apps_list_only</code> resource, see <a href="/services/sagemaker/partner_apps/#permissions"><code>partner_apps</code></a>
-
diff --git a/website/docs/services/sagemaker/pipelines/index.md b/website/docs/services/sagemaker/pipelines/index.md
index 652452105..3b19419d2 100644
--- a/website/docs/services/sagemaker/pipelines/index.md
+++ b/website/docs/services/sagemaker/pipelines/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>pipeline</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "pipeline_name",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets a <code>pipeline</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "pipeline_name",
+    "type": "string",
+    "description": "The name of the Pipeline."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-pipeline.html"><code>AWS::SageMaker::Pipeline</code></a>.
 
@@ -103,31 +129,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PipelineName, PipelineDefinition, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>pipelines_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>pipelines</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>pipeline</code>.
 ```sql
 SELECT
@@ -150,6 +191,19 @@ parallelism_configuration
 FROM awscc.sagemaker.pipelines
 WHERE region = 'us-east-1' AND data__Identifier = '<PipelineName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>pipelines</code> in a region.
+```sql
+SELECT
+region,
+pipeline_name
+FROM awscc.sagemaker.pipelines_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -241,6 +295,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.pipelines
+SET data__PatchDocument = string('{{ {
+    "PipelineDisplayName": pipeline_display_name,
+    "PipelineDescription": pipeline_description,
+    "PipelineDefinition": pipeline_definition,
+    "RoleArn": role_arn,
+    "Tags": tags,
+    "ParallelismConfiguration": parallelism_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PipelineName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/pipelines_list_only/index.md b/website/docs/services/sagemaker/pipelines_list_only/index.md
deleted file mode 100644
index 6ab8af6e9..000000000
--- a/website/docs/services/sagemaker/pipelines_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: pipelines_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - pipelines_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>pipelines</code> in a region or regions, for all properties use <a href="/services/sagemaker/pipelines/"><code>pipelines</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>pipelines_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::Pipeline</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.pipelines_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "pipeline_name",
-    "type": "string",
-    "description": "The name of the Pipeline."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>pipelines</code> in a region.
-```sql
-SELECT
-region,
-pipeline_name
-FROM awscc.sagemaker.pipelines_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>pipelines_list_only</code> resource, see <a href="/services/sagemaker/pipelines/#permissions"><code>pipelines</code></a>
-
diff --git a/website/docs/services/sagemaker/processing_jobs/index.md b/website/docs/services/sagemaker/processing_jobs/index.md
index 634fe1a1a..d3bda6296 100644
--- a/website/docs/services/sagemaker/processing_jobs/index.md
+++ b/website/docs/services/sagemaker/processing_jobs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>processing_job</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "app_specification",
@@ -494,6 +503,23 @@ Creates, updates, deletes or gets a <code>processing_job</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "processing_job_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the processing job."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-processingjob.html"><code>AWS::SageMaker::ProcessingJob</code></a>.
 
@@ -503,26 +529,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>processing_jobs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AppSpecification, ProcessingResources, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>processing_jobs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>processing_jobs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>processing_jobs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -531,6 +562,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>processing_job</code>.
 ```sql
 SELECT
@@ -560,6 +600,19 @@ processing_end_time
 FROM awscc.sagemaker.processing_jobs
 WHERE region = 'us-east-1' AND data__Identifier = '<ProcessingJobArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>processing_jobs</code> in a region.
+```sql
+SELECT
+region,
+processing_job_arn
+FROM awscc.sagemaker.processing_jobs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -730,6 +783,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/processing_jobs_list_only/index.md b/website/docs/services/sagemaker/processing_jobs_list_only/index.md
deleted file mode 100644
index d953f0f78..000000000
--- a/website/docs/services/sagemaker/processing_jobs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: processing_jobs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - processing_jobs_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>processing_jobs</code> in a region or regions, for all properties use <a href="/services/sagemaker/processing_jobs/"><code>processing_jobs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>processing_jobs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::ProcessingJob</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.processing_jobs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "processing_job_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the processing job."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>processing_jobs</code> in a region.
-```sql
-SELECT
-region,
-processing_job_arn
-FROM awscc.sagemaker.processing_jobs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>processing_jobs_list_only</code> resource, see <a href="/services/sagemaker/processing_jobs/#permissions"><code>processing_jobs</code></a>
-
diff --git a/website/docs/services/sagemaker/projects/index.md b/website/docs/services/sagemaker/projects/index.md
index 61a8a4212..7e159b7c9 100644
--- a/website/docs/services/sagemaker/projects/index.md
+++ b/website/docs/services/sagemaker/projects/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>project</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "tags",
@@ -189,6 +198,23 @@ Creates, updates, deletes or gets a <code>project</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "project_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the Project."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-project.html"><code>AWS::SageMaker::Project</code></a>.
 
@@ -198,31 +224,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ProjectName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>projects_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>projects</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -231,6 +263,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>project</code>.
 ```sql
 SELECT
@@ -248,6 +289,19 @@ project_status
 FROM awscc.sagemaker.projects
 WHERE region = 'us-east-1' AND data__Identifier = '<ProjectArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>projects</code> in a region.
+```sql
+SELECT
+region,
+project_arn
+FROM awscc.sagemaker.projects_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -345,6 +399,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.projects
+SET data__PatchDocument = string('{{ {
+    "ServiceCatalogProvisionedProductDetails": service_catalog_provisioned_product_details
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ProjectArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/projects_list_only/index.md b/website/docs/services/sagemaker/projects_list_only/index.md
deleted file mode 100644
index 47b03e377..000000000
--- a/website/docs/services/sagemaker/projects_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: projects_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - projects_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>projects</code> in a region or regions, for all properties use <a href="/services/sagemaker/projects/"><code>projects</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>projects_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::Project</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.projects_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "project_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the Project."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>projects</code> in a region.
-```sql
-SELECT
-region,
-project_arn
-FROM awscc.sagemaker.projects_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>projects_list_only</code> resource, see <a href="/services/sagemaker/projects/#permissions"><code>projects</code></a>
-
diff --git a/website/docs/services/sagemaker/spaces/index.md b/website/docs/services/sagemaker/spaces/index.md
index dd6fad7f6..c6eb0944a 100644
--- a/website/docs/services/sagemaker/spaces/index.md
+++ b/website/docs/services/sagemaker/spaces/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>space</code> resource or lists <code>s
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "space_arn",
@@ -394,6 +403,28 @@ Creates, updates, deletes or gets a <code>space</code> resource or lists <code>s
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": "The ID of the associated Domain."
+  },
+  {
+    "name": "space_name",
+    "type": "string",
+    "description": "A name for the Space."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-space.html"><code>AWS::SageMaker::Space</code></a>.
 
@@ -403,31 +434,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>spaces</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainId, SpaceName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>spaces</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>spaces</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>spaces_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>spaces</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -436,6 +473,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>space</code>.
 ```sql
 SELECT
@@ -452,6 +498,20 @@ url
 FROM awscc.sagemaker.spaces
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainId>|<SpaceName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>spaces</code> in a region.
+```sql
+SELECT
+region,
+domain_id,
+space_name
+FROM awscc.sagemaker.spaces_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -581,6 +641,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.spaces
+SET data__PatchDocument = string('{{ {
+    "SpaceSettings": space_settings,
+    "Tags": tags,
+    "SpaceDisplayName": space_display_name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainId>|<SpaceName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/spaces_list_only/index.md b/website/docs/services/sagemaker/spaces_list_only/index.md
deleted file mode 100644
index 080161e9f..000000000
--- a/website/docs/services/sagemaker/spaces_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: spaces_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - spaces_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>spaces</code> in a region or regions, for all properties use <a href="/services/sagemaker/spaces/"><code>spaces</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>spaces_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::Space</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.spaces_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": "The ID of the associated Domain."
-  },
-  {
-    "name": "space_name",
-    "type": "string",
-    "description": "A name for the Space."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>spaces</code> in a region.
-```sql
-SELECT
-region,
-domain_id,
-space_name
-FROM awscc.sagemaker.spaces_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>spaces_list_only</code> resource, see <a href="/services/sagemaker/spaces/#permissions"><code>spaces</code></a>
-
diff --git a/website/docs/services/sagemaker/studio_lifecycle_configs/index.md b/website/docs/services/sagemaker/studio_lifecycle_configs/index.md
index 1a38c6f64..c89fe5df5 100644
--- a/website/docs/services/sagemaker/studio_lifecycle_configs/index.md
+++ b/website/docs/services/sagemaker/studio_lifecycle_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>studio_lifecycle_config</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "studio_lifecycle_config_arn",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>studio_lifecycle_config</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "studio_lifecycle_config_name",
+    "type": "string",
+    "description": "The name of the Amazon SageMaker Studio Lifecycle Configuration."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-studiolifecycleconfig.html"><code>AWS::SageMaker::StudioLifecycleConfig</code></a>.
 
@@ -86,26 +112,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>studio_lifecycle_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="StudioLifecycleConfigAppType, StudioLifecycleConfigContent, StudioLifecycleConfigName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>studio_lifecycle_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>studio_lifecycle_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>studio_lifecycle_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +145,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>studio_lifecycle_config</code>.
 ```sql
 SELECT
@@ -126,6 +166,19 @@ tags
 FROM awscc.sagemaker.studio_lifecycle_configs
 WHERE region = 'us-east-1' AND data__Identifier = '<StudioLifecycleConfigName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>studio_lifecycle_configs</code> in a region.
+```sql
+SELECT
+region,
+studio_lifecycle_config_name
+FROM awscc.sagemaker.studio_lifecycle_configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -204,6 +257,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/studio_lifecycle_configs_list_only/index.md b/website/docs/services/sagemaker/studio_lifecycle_configs_list_only/index.md
deleted file mode 100644
index d7966d565..000000000
--- a/website/docs/services/sagemaker/studio_lifecycle_configs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: studio_lifecycle_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - studio_lifecycle_configs_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>studio_lifecycle_configs</code> in a region or regions, for all properties use <a href="/services/sagemaker/studio_lifecycle_configs/"><code>studio_lifecycle_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>studio_lifecycle_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::StudioLifecycleConfig</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.studio_lifecycle_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "studio_lifecycle_config_name",
-    "type": "string",
-    "description": "The name of the Amazon SageMaker Studio Lifecycle Configuration."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>studio_lifecycle_configs</code> in a region.
-```sql
-SELECT
-region,
-studio_lifecycle_config_name
-FROM awscc.sagemaker.studio_lifecycle_configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>studio_lifecycle_configs_list_only</code> resource, see <a href="/services/sagemaker/studio_lifecycle_configs/#permissions"><code>studio_lifecycle_configs</code></a>
-
diff --git a/website/docs/services/sagemaker/user_profiles/index.md b/website/docs/services/sagemaker/user_profiles/index.md
index 2d40ce0fd..4fbb85ff7 100644
--- a/website/docs/services/sagemaker/user_profiles/index.md
+++ b/website/docs/services/sagemaker/user_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>user_profile</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "user_profile_arn",
@@ -554,6 +563,28 @@ Creates, updates, deletes or gets an <code>user_profile</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": "The ID of the associated Domain."
+  },
+  {
+    "name": "user_profile_name",
+    "type": "string",
+    "description": "A name for the UserProfile."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-userprofile.html"><code>AWS::SageMaker::UserProfile</code></a>.
 
@@ -563,31 +594,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>user_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DomainId, UserProfileName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>user_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>user_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>user_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>user_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -596,6 +633,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user_profile</code>.
 ```sql
 SELECT
@@ -610,6 +656,20 @@ tags
 FROM awscc.sagemaker.user_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<UserProfileName>|<DomainId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>user_profiles</code> in a region.
+```sql
+SELECT
+region,
+user_profile_name,
+domain_id
+FROM awscc.sagemaker.user_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -774,6 +834,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sagemaker/user_profiles_list_only/index.md b/website/docs/services/sagemaker/user_profiles_list_only/index.md
deleted file mode 100644
index e51720a7d..000000000
--- a/website/docs/services/sagemaker/user_profiles_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: user_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - user_profiles_list_only
-  - sagemaker
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>user_profiles</code> in a region or regions, for all properties use <a href="/services/sagemaker/user_profiles/"><code>user_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>user_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::UserProfile</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.user_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": "The ID of the associated Domain."
-  },
-  {
-    "name": "user_profile_name",
-    "type": "string",
-    "description": "A name for the UserProfile."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>user_profiles</code> in a region.
-```sql
-SELECT
-region,
-user_profile_name,
-domain_id
-FROM awscc.sagemaker.user_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>user_profiles_list_only</code> resource, see <a href="/services/sagemaker/user_profiles/#permissions"><code>user_profiles</code></a>
-
diff --git a/website/docs/services/scheduler/index.md b/website/docs/services/scheduler/index.md
index f98e0dca4..79ea02bf4 100644
--- a/website/docs/services/scheduler/index.md
+++ b/website/docs/services/scheduler/index.md
@@ -20,7 +20,7 @@ The scheduler service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The scheduler service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/scheduler/schedule_groups/">schedule_groups</a><br />
-<a href="/services/scheduler/schedule_groups_list_only/">schedule_groups_list_only</a>
+<a href="/services/scheduler/schedule_groups/">schedule_groups</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/scheduler/schedules/">schedules</a><br />
-<a href="/services/scheduler/schedules_list_only/">schedules_list_only</a>
+<a href="/services/scheduler/schedules/">schedules</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/scheduler/schedule_groups/index.md b/website/docs/services/scheduler/schedule_groups/index.md
index 511c1d022..a3a2638e7 100644
--- a/website/docs/services/scheduler/schedule_groups/index.md
+++ b/website/docs/services/scheduler/schedule_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>schedule_group</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>schedule_group</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-scheduler-schedulegroup.html"><code>AWS::Scheduler::ScheduleGroup</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>schedule_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>schedule_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>schedule_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>schedule_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>schedule_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>schedule_group</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.scheduler.schedule_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>schedule_groups</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.scheduler.schedule_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +259,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.scheduler.schedule_groups
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/scheduler/schedule_groups_list_only/index.md b/website/docs/services/scheduler/schedule_groups_list_only/index.md
deleted file mode 100644
index 3f7531c30..000000000
--- a/website/docs/services/scheduler/schedule_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: schedule_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - schedule_groups_list_only
-  - scheduler
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>schedule_groups</code> in a region or regions, for all properties use <a href="/services/scheduler/schedule_groups/"><code>schedule_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>schedule_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Scheduler::ScheduleGroup Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.scheduler.schedule_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>schedule_groups</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.scheduler.schedule_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>schedule_groups_list_only</code> resource, see <a href="/services/scheduler/schedule_groups/#permissions"><code>schedule_groups</code></a>
-
diff --git a/website/docs/services/scheduler/schedules/index.md b/website/docs/services/scheduler/schedules/index.md
index 2519f61d7..1538d2887 100644
--- a/website/docs/services/scheduler/schedules/index.md
+++ b/website/docs/services/scheduler/schedules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>schedule</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -348,6 +357,23 @@ Creates, updates, deletes or gets a <code>schedule</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-scheduler-schedule.html"><code>AWS::Scheduler::Schedule</code></a>.
 
@@ -357,31 +383,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>schedules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="FlexibleTimeWindow, ScheduleExpression, Target, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>schedules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>schedules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>schedules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>schedules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -390,6 +422,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>schedule</code>.
 ```sql
 SELECT
@@ -409,6 +450,19 @@ target
 FROM awscc.scheduler.schedules
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>schedules</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.scheduler.schedules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -563,6 +617,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.scheduler.schedules
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "EndDate": end_date,
+    "FlexibleTimeWindow": flexible_time_window,
+    "GroupName": group_name,
+    "KmsKeyArn": kms_key_arn,
+    "ScheduleExpression": schedule_expression,
+    "ScheduleExpressionTimezone": schedule_expression_timezone,
+    "StartDate": start_date,
+    "State": state,
+    "Target": target
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/scheduler/schedules_list_only/index.md b/website/docs/services/scheduler/schedules_list_only/index.md
deleted file mode 100644
index 25008b288..000000000
--- a/website/docs/services/scheduler/schedules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: schedules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - schedules_list_only
-  - scheduler
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>schedules</code> in a region or regions, for all properties use <a href="/services/scheduler/schedules/"><code>schedules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>schedules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Scheduler::Schedule Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.scheduler.schedules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>schedules</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.scheduler.schedules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>schedules_list_only</code> resource, see <a href="/services/scheduler/schedules/#permissions"><code>schedules</code></a>
-
diff --git a/website/docs/services/secretsmanager/index.md b/website/docs/services/secretsmanager/index.md
index d80e8738c..2ecf7e4e4 100644
--- a/website/docs/services/secretsmanager/index.md
+++ b/website/docs/services/secretsmanager/index.md
@@ -20,7 +20,7 @@ The secretsmanager service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The secretsmanager service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/secretsmanager/resource_policies/">resource_policies</a><br />
-<a href="/services/secretsmanager/resource_policies_list_only/">resource_policies_list_only</a><br />
-<a href="/services/secretsmanager/rotation_schedules/">rotation_schedules</a><br />
-<a href="/services/secretsmanager/rotation_schedules_list_only/">rotation_schedules_list_only</a>
+<a href="/services/secretsmanager/rotation_schedules/">rotation_schedules</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/secretsmanager/secret_target_attachments/">secret_target_attachments</a><br />
-<a href="/services/secretsmanager/secret_target_attachments_list_only/">secret_target_attachments_list_only</a><br />
-<a href="/services/secretsmanager/secrets/">secrets</a><br />
-<a href="/services/secretsmanager/secrets_list_only/">secrets_list_only</a>
+<a href="/services/secretsmanager/secrets/">secrets</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/secretsmanager/resource_policies/index.md b/website/docs/services/secretsmanager/resource_policies/index.md
index 971116ee4..af7ed42aa 100644
--- a/website/docs/services/secretsmanager/resource_policies/index.md
+++ b/website/docs/services/secretsmanager/resource_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_policy</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets a <code>resource_policy</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The Arn of the secret."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-resourcepolicy.html"><code>AWS::SecretsManager::ResourcePolicy</code></a>.
 
@@ -69,31 +95,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResourcePolicy, SecretId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +134,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_policy</code>.
 ```sql
 SELECT
@@ -113,6 +154,19 @@ block_public_policy
 FROM awscc.secretsmanager.resource_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_policies</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.secretsmanager.resource_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -183,6 +237,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.secretsmanager.resource_policies
+SET data__PatchDocument = string('{{ {
+    "ResourcePolicy": resource_policy,
+    "BlockPublicPolicy": block_public_policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/secretsmanager/resource_policies_list_only/index.md b/website/docs/services/secretsmanager/resource_policies_list_only/index.md
deleted file mode 100644
index f6af327af..000000000
--- a/website/docs/services/secretsmanager/resource_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_policies_list_only
-  - secretsmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_policies</code> in a region or regions, for all properties use <a href="/services/secretsmanager/resource_policies/"><code>resource_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SecretsManager::ResourcePolicy</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.secretsmanager.resource_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The Arn of the secret."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_policies</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.secretsmanager.resource_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_policies_list_only</code> resource, see <a href="/services/secretsmanager/resource_policies/#permissions"><code>resource_policies</code></a>
-
diff --git a/website/docs/services/secretsmanager/rotation_schedules/index.md b/website/docs/services/secretsmanager/rotation_schedules/index.md
index 9cda9f1c3..92f9133ce 100644
--- a/website/docs/services/secretsmanager/rotation_schedules/index.md
+++ b/website/docs/services/secretsmanager/rotation_schedules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>rotation_schedule</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "hosted_rotation_lambda",
@@ -144,6 +153,23 @@ Creates, updates, deletes or gets a <code>rotation_schedule</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ARN of the secret."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-rotationschedule.html"><code>AWS::SecretsManager::RotationSchedule</code></a>.
 
@@ -153,31 +179,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>rotation_schedules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SecretId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>rotation_schedules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>rotation_schedules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>rotation_schedules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>rotation_schedules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -186,6 +218,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>rotation_schedule</code>.
 ```sql
 SELECT
@@ -199,6 +240,19 @@ rotation_rules
 FROM awscc.secretsmanager.rotation_schedules
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>rotation_schedules</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.secretsmanager.rotation_schedules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -289,6 +343,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.secretsmanager.rotation_schedules
+SET data__PatchDocument = string('{{ {
+    "HostedRotationLambda": hosted_rotation_lambda,
+    "RotateImmediatelyOnUpdate": rotate_immediately_on_update,
+    "RotationLambdaARN": rotation_lambda_arn,
+    "RotationRules": rotation_rules
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/secretsmanager/rotation_schedules_list_only/index.md b/website/docs/services/secretsmanager/rotation_schedules_list_only/index.md
deleted file mode 100644
index 60a0f64a6..000000000
--- a/website/docs/services/secretsmanager/rotation_schedules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: rotation_schedules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - rotation_schedules_list_only
-  - secretsmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>rotation_schedules</code> in a region or regions, for all properties use <a href="/services/secretsmanager/rotation_schedules/"><code>rotation_schedules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>rotation_schedules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SecretsManager::RotationSchedule</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.secretsmanager.rotation_schedules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ARN of the secret."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>rotation_schedules</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.secretsmanager.rotation_schedules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>rotation_schedules_list_only</code> resource, see <a href="/services/secretsmanager/rotation_schedules/#permissions"><code>rotation_schedules</code></a>
-
diff --git a/website/docs/services/secretsmanager/secret_target_attachments/index.md b/website/docs/services/secretsmanager/secret_target_attachments/index.md
index 28b89994c..686430f19 100644
--- a/website/docs/services/secretsmanager/secret_target_attachments/index.md
+++ b/website/docs/services/secretsmanager/secret_target_attachments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>secret_target_attachment</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets a <code>secret_target_attachment</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secrettargetattachment.html"><code>AWS::SecretsManager::SecretTargetAttachment</code></a>.
 
@@ -69,31 +95,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>secret_target_attachments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TargetType, TargetId, SecretId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>secret_target_attachments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>secret_target_attachments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>secret_target_attachments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>secret_target_attachments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +134,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>secret_target_attachment</code>.
 ```sql
 SELECT
@@ -113,6 +154,19 @@ target_id
 FROM awscc.secretsmanager.secret_target_attachments
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>secret_target_attachments</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.secretsmanager.secret_target_attachments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -185,6 +239,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.secretsmanager.secret_target_attachments
+SET data__PatchDocument = string('{{ {
+    "TargetType": target_type,
+    "TargetId": target_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/secretsmanager/secret_target_attachments_list_only/index.md b/website/docs/services/secretsmanager/secret_target_attachments_list_only/index.md
deleted file mode 100644
index 01b164f3c..000000000
--- a/website/docs/services/secretsmanager/secret_target_attachments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: secret_target_attachments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - secret_target_attachments_list_only
-  - secretsmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>secret_target_attachments</code> in a region or regions, for all properties use <a href="/services/secretsmanager/secret_target_attachments/"><code>secret_target_attachments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>secret_target_attachments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SecretsManager::SecretTargetAttachment</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.secretsmanager.secret_target_attachments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>secret_target_attachments</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.secretsmanager.secret_target_attachments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>secret_target_attachments_list_only</code> resource, see <a href="/services/secretsmanager/secret_target_attachments/#permissions"><code>secret_target_attachments</code></a>
-
diff --git a/website/docs/services/secretsmanager/secrets/index.md b/website/docs/services/secretsmanager/secrets/index.md
index 2085e9760..49548019d 100644
--- a/website/docs/services/secretsmanager/secrets/index.md
+++ b/website/docs/services/secretsmanager/secrets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>secret</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -156,6 +165,23 @@ Creates, updates, deletes or gets a <code>secret</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html"><code>AWS::SecretsManager::Secret</code></a>.
 
@@ -165,31 +191,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>secrets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>secrets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>secrets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>secrets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>secrets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -198,6 +230,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>secret</code>.
 ```sql
 SELECT
@@ -213,6 +254,19 @@ name
 FROM awscc.secretsmanager.secrets
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>secrets</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.secretsmanager.secrets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -323,6 +377,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.secretsmanager.secrets
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "KmsKeyId": kms_key_id,
+    "SecretString": secret_string,
+    "GenerateSecretString": generate_secret_string,
+    "ReplicaRegions": replica_regions,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/secretsmanager/secrets_list_only/index.md b/website/docs/services/secretsmanager/secrets_list_only/index.md
deleted file mode 100644
index a38aa2426..000000000
--- a/website/docs/services/secretsmanager/secrets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: secrets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - secrets_list_only
-  - secretsmanager
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>secrets</code> in a region or regions, for all properties use <a href="/services/secretsmanager/secrets/"><code>secrets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>secrets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a new secret. A &#42;secret&#42; can be a password, a set of credentials such as a user name and password, an OAuth token, or other secret information that you store in an encrypted form in Secrets Manager.<br />For RDS master user credentials, see &#91;AWS::RDS::DBCluster MasterUserSecret&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbcluster-masterusersecret.html).<br />For RS admin user credentials, see &#91;AWS::Redshift::Cluster&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html).<br />To retrieve a secret in a CFNshort template, use a &#42;dynamic reference&#42;. For more information, see &#91;Retrieve a secret in an resource&#93;(https://docs.aws.amazon.com/secretsmanager/latest/userguide/cfn-example&#95;reference-secret.html).<br />For information about creating a secret in the console, see &#91;Create a secret&#93;(https://docs.aws.amazon.com/secretsmanager/latest/userguide/manage&#95;create-basic-secret.html). For information about creating a secret using the CLI or SDK, see &#91;CreateSecret&#93;(https://docs.aws.amazon.com/secretsmanager/latest/apireference/API&#95;CreateSecret.html).<br />For information about retrieving a secret in code, see &#91;Retrieve secrets from Secrets Manager&#93;(https://docs.aws.amazon.com/secretsmanager/latest/userguide/retrieving-secrets.html).</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.secretsmanager.secrets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>secrets</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.secretsmanager.secrets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>secrets_list_only</code> resource, see <a href="/services/secretsmanager/secrets/#permissions"><code>secrets</code></a>
-
diff --git a/website/docs/services/securityhub/aggregator_v2s/index.md b/website/docs/services/securityhub/aggregator_v2s/index.md
index 3f53a4745..d4e4b8082 100644
--- a/website/docs/services/securityhub/aggregator_v2s/index.md
+++ b/website/docs/services/securityhub/aggregator_v2s/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>aggregator_v2</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "aggregator_v2_arn",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets an <code>aggregator_v2</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "aggregator_v2_arn",
+    "type": "string",
+    "description": "The ARN of the AggregatorV2 being created and assigned as the unique identifier"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-aggregatorv2.html"><code>AWS::SecurityHub::AggregatorV2</code></a>.
 
@@ -69,31 +95,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>aggregator_v2s</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RegionLinkingMode, LinkedRegions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>aggregator_v2s</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>aggregator_v2s</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>aggregator_v2s_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>aggregator_v2s</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +134,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>aggregator_v2</code>.
 ```sql
 SELECT
@@ -114,6 +155,19 @@ aggregation_region
 FROM awscc.securityhub.aggregator_v2s
 WHERE region = 'us-east-1' AND data__Identifier = '<AggregatorV2Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>aggregator_v2s</code> in a region.
+```sql
+SELECT
+region,
+aggregator_v2_arn
+FROM awscc.securityhub.aggregator_v2s_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -185,6 +239,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.securityhub.aggregator_v2s
+SET data__PatchDocument = string('{{ {
+    "RegionLinkingMode": region_linking_mode,
+    "LinkedRegions": linked_regions,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AggregatorV2Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securityhub/aggregator_v2s_list_only/index.md b/website/docs/services/securityhub/aggregator_v2s_list_only/index.md
deleted file mode 100644
index d46177872..000000000
--- a/website/docs/services/securityhub/aggregator_v2s_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: aggregator_v2s_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - aggregator_v2s_list_only
-  - securityhub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>aggregator_v2s</code> in a region or regions, for all properties use <a href="/services/securityhub/aggregator_v2s/"><code>aggregator_v2s</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>aggregator_v2s_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::SecurityHub::AggregatorV2 resource represents the AWS Security Hub AggregatorV2 in your account. One aggregatorv2 resource is created for each account in non opt-in region in which you configure region linking mode.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securityhub.aggregator_v2s_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "aggregator_v2_arn",
-    "type": "string",
-    "description": "The ARN of the AggregatorV2 being created and assigned as the unique identifier"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>aggregator_v2s</code> in a region.
-```sql
-SELECT
-region,
-aggregator_v2_arn
-FROM awscc.securityhub.aggregator_v2s_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>aggregator_v2s_list_only</code> resource, see <a href="/services/securityhub/aggregator_v2s/#permissions"><code>aggregator_v2s</code></a>
-
diff --git a/website/docs/services/securityhub/automation_rule_v2s/index.md b/website/docs/services/securityhub/automation_rule_v2s/index.md
index 29f762bb6..6f1b61c76 100644
--- a/website/docs/services/securityhub/automation_rule_v2s/index.md
+++ b/website/docs/services/securityhub/automation_rule_v2s/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>automation_rule_v2</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "rule_name",
@@ -182,6 +191,23 @@ Creates, updates, deletes or gets an <code>automation_rule_v2</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "rule_arn",
+    "type": "string",
+    "description": "The ARN of the automation rule"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-automationrulev2.html"><code>AWS::SecurityHub::AutomationRuleV2</code></a>.
 
@@ -191,31 +217,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>automation_rule_v2s</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RuleName, Description, RuleOrder, Criteria, Actions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>automation_rule_v2s</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>automation_rule_v2s</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>automation_rule_v2s_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>automation_rule_v2s</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -224,6 +256,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>automation_rule_v2</code>.
 ```sql
 SELECT
@@ -242,6 +283,19 @@ updated_at
 FROM awscc.securityhub.automation_rule_v2s
 WHERE region = 'us-east-1' AND data__Identifier = '<RuleArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>automation_rule_v2s</code> in a region.
+```sql
+SELECT
+region,
+rule_arn
+FROM awscc.securityhub.automation_rule_v2s_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -374,6 +428,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.securityhub.automation_rule_v2s
+SET data__PatchDocument = string('{{ {
+    "RuleName": rule_name,
+    "RuleStatus": rule_status,
+    "Description": description,
+    "RuleOrder": rule_order,
+    "Criteria": criteria,
+    "Actions": actions,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RuleArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securityhub/automation_rule_v2s_list_only/index.md b/website/docs/services/securityhub/automation_rule_v2s_list_only/index.md
deleted file mode 100644
index 399089e90..000000000
--- a/website/docs/services/securityhub/automation_rule_v2s_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: automation_rule_v2s_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - automation_rule_v2s_list_only
-  - securityhub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>automation_rule_v2s</code> in a region or regions, for all properties use <a href="/services/securityhub/automation_rule_v2s/"><code>automation_rule_v2s</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>automation_rule_v2s_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::SecurityHub::AutomationRuleV2</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securityhub.automation_rule_v2s_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "rule_arn",
-    "type": "string",
-    "description": "The ARN of the automation rule"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>automation_rule_v2s</code> in a region.
-```sql
-SELECT
-region,
-rule_arn
-FROM awscc.securityhub.automation_rule_v2s_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>automation_rule_v2s_list_only</code> resource, see <a href="/services/securityhub/automation_rule_v2s/#permissions"><code>automation_rule_v2s</code></a>
-
diff --git a/website/docs/services/securityhub/automation_rules/index.md b/website/docs/services/securityhub/automation_rules/index.md
index 476a7f959..ad7370f65 100644
--- a/website/docs/services/securityhub/automation_rules/index.md
+++ b/website/docs/services/securityhub/automation_rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>automation_rule</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "rule_arn",
@@ -434,6 +443,23 @@ Creates, updates, deletes or gets an <code>automation_rule</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "rule_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-automationrule.html"><code>AWS::SecurityHub::AutomationRule</code></a>.
 
@@ -443,31 +469,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>automation_rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RuleOrder, RuleName, Description, Criteria, Actions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>automation_rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>automation_rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>automation_rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>automation_rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -476,6 +508,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>automation_rule</code>.
 ```sql
 SELECT
@@ -495,6 +536,19 @@ tags
 FROM awscc.securityhub.automation_rules
 WHERE region = 'us-east-1' AND data__Identifier = '<RuleArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>automation_rules</code> in a region.
+```sql
+SELECT
+region,
+rule_arn
+FROM awscc.securityhub.automation_rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -690,6 +744,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.securityhub.automation_rules
+SET data__PatchDocument = string('{{ {
+    "RuleStatus": rule_status,
+    "RuleOrder": rule_order,
+    "Description": description,
+    "RuleName": rule_name,
+    "IsTerminal": is_terminal,
+    "Actions": actions,
+    "Criteria": criteria,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RuleArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securityhub/automation_rules_list_only/index.md b/website/docs/services/securityhub/automation_rules_list_only/index.md
deleted file mode 100644
index a4f0895b0..000000000
--- a/website/docs/services/securityhub/automation_rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: automation_rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - automation_rules_list_only
-  - securityhub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>automation_rules</code> in a region or regions, for all properties use <a href="/services/securityhub/automation_rules/"><code>automation_rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>automation_rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::SecurityHub::AutomationRule&#96;&#96; resource specifies an automation rule based on input parameters. For more information, see &#91;Automation rules&#93;(https://docs.aws.amazon.com/securityhub/latest/userguide/automation-rules.html) in the &#42;User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securityhub.automation_rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "rule_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>automation_rules</code> in a region.
-```sql
-SELECT
-region,
-rule_arn
-FROM awscc.securityhub.automation_rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>automation_rules_list_only</code> resource, see <a href="/services/securityhub/automation_rules/#permissions"><code>automation_rules</code></a>
-
diff --git a/website/docs/services/securityhub/configuration_policies/index.md b/website/docs/services/securityhub/configuration_policies/index.md
index 637ece9a9..07d767cd0 100644
--- a/website/docs/services/securityhub/configuration_policies/index.md
+++ b/website/docs/services/securityhub/configuration_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>configuration_policy</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -126,6 +135,23 @@ Creates, updates, deletes or gets a <code>configuration_policy</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the configuration policy."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-configurationpolicy.html"><code>AWS::SecurityHub::ConfigurationPolicy</code></a>.
 
@@ -135,31 +161,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>configuration_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConfigurationPolicy, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>configuration_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>configuration_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>configuration_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>configuration_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -168,6 +200,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>configuration_policy</code>.
 ```sql
 SELECT
@@ -184,6 +225,19 @@ tags
 FROM awscc.securityhub.configuration_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>configuration_policies</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.securityhub.configuration_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -270,6 +324,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.securityhub.configuration_policies
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "ConfigurationPolicy": configuration_policy,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securityhub/configuration_policies_list_only/index.md b/website/docs/services/securityhub/configuration_policies_list_only/index.md
deleted file mode 100644
index 0ae5dd798..000000000
--- a/website/docs/services/securityhub/configuration_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: configuration_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - configuration_policies_list_only
-  - securityhub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>configuration_policies</code> in a region or regions, for all properties use <a href="/services/securityhub/configuration_policies/"><code>configuration_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>configuration_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::SecurityHub::ConfigurationPolicy resource represents the Central Configuration Policy in your account.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securityhub.configuration_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the configuration policy."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>configuration_policies</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.securityhub.configuration_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>configuration_policies_list_only</code> resource, see <a href="/services/securityhub/configuration_policies/#permissions"><code>configuration_policies</code></a>
-
diff --git a/website/docs/services/securityhub/delegated_admins/index.md b/website/docs/services/securityhub/delegated_admins/index.md
index 0bc654e8c..6eb2d83b2 100644
--- a/website/docs/services/securityhub/delegated_admins/index.md
+++ b/website/docs/services/securityhub/delegated_admins/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>delegated_admin</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "delegated_admin_identifier",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets a <code>delegated_admin</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "delegated_admin_identifier",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-delegatedadmin.html"><code>AWS::SecurityHub::DelegatedAdmin</code></a>.
 
@@ -64,26 +90,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>delegated_admins</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AdminAccountId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>delegated_admins</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>delegated_admins_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>delegated_admins</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +123,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>delegated_admin</code>.
 ```sql
 SELECT
@@ -102,6 +142,19 @@ status
 FROM awscc.securityhub.delegated_admins
 WHERE region = 'us-east-1' AND data__Identifier = '<DelegatedAdminIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>delegated_admins</code> in a region.
+```sql
+SELECT
+region,
+delegated_admin_identifier
+FROM awscc.securityhub.delegated_admins_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -162,6 +215,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securityhub/delegated_admins_list_only/index.md b/website/docs/services/securityhub/delegated_admins_list_only/index.md
deleted file mode 100644
index b6d68c9e4..000000000
--- a/website/docs/services/securityhub/delegated_admins_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: delegated_admins_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - delegated_admins_list_only
-  - securityhub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>delegated_admins</code> in a region or regions, for all properties use <a href="/services/securityhub/delegated_admins/"><code>delegated_admins</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>delegated_admins_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::SecurityHub::DelegatedAdmin&#96;&#96; resource designates the delegated ASHlong administrator account for an organization. You must enable the integration between ASH and AOlong before you can designate a delegated ASH administrator. Only the management account for an organization can designate the delegated ASH administrator account. For more information, see &#91;Designating the delegated administrator&#93;(https://docs.aws.amazon.com/securityhub/latest/userguide/designate-orgs-admin-account.html#designate-admin-instructions) in the &#42;User Guide&#42;.<br />To change the delegated administrator account, remove the current delegated administrator account, and then designate the new account.<br />To designate multiple delegated administrators in different organizations and AWS-Regions, we recommend using &#91;mappings&#93;(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/mappings-section-structure.html).<br />Tags aren't supported for this resource.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securityhub.delegated_admins_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "delegated_admin_identifier",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>delegated_admins</code> in a region.
-```sql
-SELECT
-region,
-delegated_admin_identifier
-FROM awscc.securityhub.delegated_admins_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>delegated_admins_list_only</code> resource, see <a href="/services/securityhub/delegated_admins/#permissions"><code>delegated_admins</code></a>
-
diff --git a/website/docs/services/securityhub/finding_aggregators/index.md b/website/docs/services/securityhub/finding_aggregators/index.md
index 4785ba760..e60d9f316 100644
--- a/website/docs/services/securityhub/finding_aggregators/index.md
+++ b/website/docs/services/securityhub/finding_aggregators/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>finding_aggregator</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "finding_aggregator_arn",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets a <code>finding_aggregator</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "finding_aggregator_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-findingaggregator.html"><code>AWS::SecurityHub::FindingAggregator</code></a>.
 
@@ -64,31 +90,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>finding_aggregators</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RegionLinkingMode, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>finding_aggregators</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>finding_aggregators</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>finding_aggregators_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>finding_aggregators</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +129,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>finding_aggregator</code>.
 ```sql
 SELECT
@@ -108,6 +149,19 @@ finding_aggregation_region
 FROM awscc.securityhub.finding_aggregators
 WHERE region = 'us-east-1' AND data__Identifier = '<FindingAggregatorArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>finding_aggregators</code> in a region.
+```sql
+SELECT
+region,
+finding_aggregator_arn
+FROM awscc.securityhub.finding_aggregators_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -173,6 +227,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.securityhub.finding_aggregators
+SET data__PatchDocument = string('{{ {
+    "RegionLinkingMode": region_linking_mode,
+    "Regions": regions
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<FindingAggregatorArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securityhub/finding_aggregators_list_only/index.md b/website/docs/services/securityhub/finding_aggregators_list_only/index.md
deleted file mode 100644
index 3205b84a2..000000000
--- a/website/docs/services/securityhub/finding_aggregators_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: finding_aggregators_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - finding_aggregators_list_only
-  - securityhub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>finding_aggregators</code> in a region or regions, for all properties use <a href="/services/securityhub/finding_aggregators/"><code>finding_aggregators</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>finding_aggregators_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::SecurityHub::FindingAggregator&#96;&#96; resource enables cross-Region aggregation. When cross-Region aggregation is enabled, you can aggregate findings, finding updates, insights, control compliance statuses, and security scores from one or more linked Regions to a single aggregation Region. You can then view and manage all of this data from the aggregation Region. For more details about cross-Region aggregation, see &#91;Cross-Region aggregation&#93;(https://docs.aws.amazon.com/securityhub/latest/userguide/finding-aggregation.html) in the &#42;User Guide&#42;<br />This resource must be created in the Region that you want to designate as your aggregation Region.<br />Cross-Region aggregation is also a prerequisite for using &#91;central configuration&#93;(https://docs.aws.amazon.com/securityhub/latest/userguide/central-configuration-intro.html) in ASH.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securityhub.finding_aggregators_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "finding_aggregator_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>finding_aggregators</code> in a region.
-```sql
-SELECT
-region,
-finding_aggregator_arn
-FROM awscc.securityhub.finding_aggregators_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>finding_aggregators_list_only</code> resource, see <a href="/services/securityhub/finding_aggregators/#permissions"><code>finding_aggregators</code></a>
-
diff --git a/website/docs/services/securityhub/hub_v2s/index.md b/website/docs/services/securityhub/hub_v2s/index.md
index 81a816a3a..062fac266 100644
--- a/website/docs/services/securityhub/hub_v2s/index.md
+++ b/website/docs/services/securityhub/hub_v2s/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>hub_v2</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "hub_v2_arn",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets a <code>hub_v2</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "hub_v2_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name of the Security Hub V2 resource."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-hubv2.html"><code>AWS::SecurityHub::HubV2</code></a>.
 
@@ -64,31 +90,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>hub_v2s</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>hub_v2s</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>hub_v2s</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>hub_v2s_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>hub_v2s</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +129,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>hub_v2</code>.
 ```sql
 SELECT
@@ -107,6 +148,19 @@ tags
 FROM awscc.securityhub.hub_v2s
 WHERE region = 'us-east-1' AND data__Identifier = '<HubV2Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>hub_v2s</code> in a region.
+```sql
+SELECT
+region,
+hub_v2_arn
+FROM awscc.securityhub.hub_v2s_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -167,6 +221,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.securityhub.hub_v2s
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<HubV2Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securityhub/hub_v2s_list_only/index.md b/website/docs/services/securityhub/hub_v2s_list_only/index.md
deleted file mode 100644
index e99cfed9a..000000000
--- a/website/docs/services/securityhub/hub_v2s_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: hub_v2s_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - hub_v2s_list_only
-  - securityhub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>hub_v2s</code> in a region or regions, for all properties use <a href="/services/securityhub/hub_v2s/"><code>hub_v2s</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>hub_v2s_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::SecurityHub::HubV2 resource represents the implementation of the AWS Security Hub V2 service in your account. Only one hubv2 resource can created in each region in which you enable Security Hub V2.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securityhub.hub_v2s_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "hub_v2_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name of the Security Hub V2 resource."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>hub_v2s</code> in a region.
-```sql
-SELECT
-region,
-hub_v2_arn
-FROM awscc.securityhub.hub_v2s_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>hub_v2s_list_only</code> resource, see <a href="/services/securityhub/hub_v2s/#permissions"><code>hub_v2s</code></a>
-
diff --git a/website/docs/services/securityhub/hubs/index.md b/website/docs/services/securityhub/hubs/index.md
index 2b8a5693d..44201a3b3 100644
--- a/website/docs/services/securityhub/hubs/index.md
+++ b/website/docs/services/securityhub/hubs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>hub</code> resource or lists <code>hub
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -70,6 +79,23 @@ Creates, updates, deletes or gets a <code>hub</code> resource or lists <code>hub
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "An ARN is automatically created for the customer."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-hub.html"><code>AWS::SecurityHub::Hub</code></a>.
 
@@ -79,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>hubs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>hubs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>hubs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>hubs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>hubs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>hub</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ subscribed_at
 FROM awscc.securityhub.hubs
 WHERE region = 'us-east-1' AND data__Identifier = '<ARN>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>hubs</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.securityhub.hubs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -203,6 +257,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.securityhub.hubs
+SET data__PatchDocument = string('{{ {
+    "EnableDefaultStandards": enable_default_standards,
+    "ControlFindingGenerator": control_finding_generator,
+    "AutoEnableControls": auto_enable_controls,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ARN>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securityhub/hubs_list_only/index.md b/website/docs/services/securityhub/hubs_list_only/index.md
deleted file mode 100644
index ecb932958..000000000
--- a/website/docs/services/securityhub/hubs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: hubs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - hubs_list_only
-  - securityhub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>hubs</code> in a region or regions, for all properties use <a href="/services/securityhub/hubs/"><code>hubs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>hubs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::SecurityHub::Hub resource represents the implementation of the AWS Security Hub service in your account. One hub resource is created for each Region in which you enable Security Hub.<br /></td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securityhub.hubs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "An ARN is automatically created for the customer."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>hubs</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.securityhub.hubs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>hubs_list_only</code> resource, see <a href="/services/securityhub/hubs/#permissions"><code>hubs</code></a>
-
diff --git a/website/docs/services/securityhub/index.md b/website/docs/services/securityhub/index.md
index ca00ae8d7..f17defa67 100644
--- a/website/docs/services/securityhub/index.md
+++ b/website/docs/services/securityhub/index.md
@@ -20,7 +20,7 @@ The securityhub service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>28</b></span><br />
+<span>total resources:&nbsp;<b>14</b></span><br />
 </div>
 </div>
 
@@ -30,34 +30,20 @@ The securityhub service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/securityhub/aggregator_v2s/">aggregator_v2s</a><br />
-<a href="/services/securityhub/aggregator_v2s_list_only/">aggregator_v2s_list_only</a><br />
 <a href="/services/securityhub/automation_rule_v2s/">automation_rule_v2s</a><br />
-<a href="/services/securityhub/automation_rule_v2s_list_only/">automation_rule_v2s_list_only</a><br />
 <a href="/services/securityhub/automation_rules/">automation_rules</a><br />
-<a href="/services/securityhub/automation_rules_list_only/">automation_rules_list_only</a><br />
 <a href="/services/securityhub/configuration_policies/">configuration_policies</a><br />
-<a href="/services/securityhub/configuration_policies_list_only/">configuration_policies_list_only</a><br />
 <a href="/services/securityhub/delegated_admins/">delegated_admins</a><br />
-<a href="/services/securityhub/delegated_admins_list_only/">delegated_admins_list_only</a><br />
 <a href="/services/securityhub/finding_aggregators/">finding_aggregators</a><br />
-<a href="/services/securityhub/finding_aggregators_list_only/">finding_aggregators_list_only</a><br />
-<a href="/services/securityhub/hub_v2s/">hub_v2s</a><br />
-<a href="/services/securityhub/hub_v2s_list_only/">hub_v2s_list_only</a>
+<a href="/services/securityhub/hub_v2s/">hub_v2s</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/securityhub/hubs/">hubs</a><br />
-<a href="/services/securityhub/hubs_list_only/">hubs_list_only</a><br />
 <a href="/services/securityhub/insights/">insights</a><br />
-<a href="/services/securityhub/insights_list_only/">insights_list_only</a><br />
 <a href="/services/securityhub/organization_configurations/">organization_configurations</a><br />
-<a href="/services/securityhub/organization_configurations_list_only/">organization_configurations_list_only</a><br />
 <a href="/services/securityhub/policy_associations/">policy_associations</a><br />
-<a href="/services/securityhub/policy_associations_list_only/">policy_associations_list_only</a><br />
 <a href="/services/securityhub/product_subscriptions/">product_subscriptions</a><br />
-<a href="/services/securityhub/product_subscriptions_list_only/">product_subscriptions_list_only</a><br />
 <a href="/services/securityhub/security_controls/">security_controls</a><br />
-<a href="/services/securityhub/security_controls_list_only/">security_controls_list_only</a><br />
-<a href="/services/securityhub/standards/">standards</a><br />
-<a href="/services/securityhub/standards_list_only/">standards_list_only</a>
+<a href="/services/securityhub/standards/">standards</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/securityhub/insights/index.md b/website/docs/services/securityhub/insights/index.md
index 800b4bc17..691fc3479 100644
--- a/website/docs/services/securityhub/insights/index.md
+++ b/website/docs/services/securityhub/insights/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>insight</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "insight_arn",
@@ -668,6 +677,23 @@ Creates, updates, deletes or gets an <code>insight</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "insight_arn",
+    "type": "string",
+    "description": "The ARN of a Security Hub insight"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-insight.html"><code>AWS::SecurityHub::Insight</code></a>.
 
@@ -677,31 +703,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>insights</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Filters, Name, GroupByAttribute, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>insights</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>insights</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>insights_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>insights</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -710,6 +742,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>insight</code>.
 ```sql
 SELECT
@@ -721,6 +762,19 @@ group_by_attribute
 FROM awscc.securityhub.insights
 WHERE region = 'us-east-1' AND data__Identifier = '<InsightArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>insights</code> in a region.
+```sql
+SELECT
+region,
+insight_arn
+FROM awscc.securityhub.insights_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1010,6 +1064,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.securityhub.insights
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Filters": filters,
+    "GroupByAttribute": group_by_attribute
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InsightArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securityhub/insights_list_only/index.md b/website/docs/services/securityhub/insights_list_only/index.md
deleted file mode 100644
index 89a760c71..000000000
--- a/website/docs/services/securityhub/insights_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: insights_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - insights_list_only
-  - securityhub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>insights</code> in a region or regions, for all properties use <a href="/services/securityhub/insights/"><code>insights</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>insights_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::SecurityHub::Insight resource represents the AWS Security Hub Insight in your account. An AWS Security Hub insight is a collection of related findings.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securityhub.insights_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "insight_arn",
-    "type": "string",
-    "description": "The ARN of a Security Hub insight"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>insights</code> in a region.
-```sql
-SELECT
-region,
-insight_arn
-FROM awscc.securityhub.insights_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>insights_list_only</code> resource, see <a href="/services/securityhub/insights/#permissions"><code>insights</code></a>
-
diff --git a/website/docs/services/securityhub/organization_configurations/index.md b/website/docs/services/securityhub/organization_configurations/index.md
index 758f7df0e..faee675d6 100644
--- a/website/docs/services/securityhub/organization_configurations/index.md
+++ b/website/docs/services/securityhub/organization_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>organization_configuration</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "auto_enable",
@@ -75,6 +84,23 @@ Creates, updates, deletes or gets an <code>organization_configuration</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "organization_configuration_identifier",
+    "type": "string",
+    "description": "The identifier of the OrganizationConfiguration being created and assigned as the unique identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-organizationconfiguration.html"><code>AWS::SecurityHub::OrganizationConfiguration</code></a>.
 
@@ -84,31 +110,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>organization_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AutoEnable, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>organization_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>organization_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>organization_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>organization_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +149,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>organization_configuration</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ organization_configuration_identifier
 FROM awscc.securityhub.organization_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<OrganizationConfigurationIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>organization_configurations</code> in a region.
+```sql
+SELECT
+region,
+organization_configuration_identifier
+FROM awscc.securityhub.organization_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -199,6 +253,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.securityhub.organization_configurations
+SET data__PatchDocument = string('{{ {
+    "AutoEnable": auto_enable,
+    "AutoEnableStandards": auto_enable_standards,
+    "ConfigurationType": configuration_type
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<OrganizationConfigurationIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securityhub/organization_configurations_list_only/index.md b/website/docs/services/securityhub/organization_configurations_list_only/index.md
deleted file mode 100644
index 09f27245e..000000000
--- a/website/docs/services/securityhub/organization_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: organization_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - organization_configurations_list_only
-  - securityhub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>organization_configurations</code> in a region or regions, for all properties use <a href="/services/securityhub/organization_configurations/"><code>organization_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>organization_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::SecurityHub::OrganizationConfiguration resource represents the configuration of your organization in Security Hub. Only the Security Hub administrator account can create Organization Configuration resource in each region and can opt-in to Central Configuration only in the aggregation region of FindingAggregator.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securityhub.organization_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "organization_configuration_identifier",
-    "type": "string",
-    "description": "The identifier of the OrganizationConfiguration being created and assigned as the unique identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>organization_configurations</code> in a region.
-```sql
-SELECT
-region,
-organization_configuration_identifier
-FROM awscc.securityhub.organization_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>organization_configurations_list_only</code> resource, see <a href="/services/securityhub/organization_configurations/#permissions"><code>organization_configurations</code></a>
-
diff --git a/website/docs/services/securityhub/policy_associations/index.md b/website/docs/services/securityhub/policy_associations/index.md
index adb544fd5..dd1bea776 100644
--- a/website/docs/services/securityhub/policy_associations/index.md
+++ b/website/docs/services/securityhub/policy_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>policy_association</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "configuration_policy_id",
@@ -80,6 +89,23 @@ Creates, updates, deletes or gets a <code>policy_association</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "association_identifier",
+    "type": "string",
+    "description": "A unique identifier to indicates if the target has an association"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-policyassociation.html"><code>AWS::SecurityHub::PolicyAssociation</code></a>.
 
@@ -89,31 +115,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>policy_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TargetId, TargetType, ConfigurationPolicyId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>policy_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>policy_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>policy_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>policy_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -122,6 +154,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>policy_association</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ association_identifier
 FROM awscc.securityhub.policy_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<AssociationIdentifier>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>policy_associations</code> in a region.
+```sql
+SELECT
+region,
+association_identifier
+FROM awscc.securityhub.policy_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -209,6 +263,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.securityhub.policy_associations
+SET data__PatchDocument = string('{{ {
+    "ConfigurationPolicyId": configuration_policy_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AssociationIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securityhub/policy_associations_list_only/index.md b/website/docs/services/securityhub/policy_associations_list_only/index.md
deleted file mode 100644
index 5ec602051..000000000
--- a/website/docs/services/securityhub/policy_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: policy_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - policy_associations_list_only
-  - securityhub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>policy_associations</code> in a region or regions, for all properties use <a href="/services/securityhub/policy_associations/"><code>policy_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>policy_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::SecurityHub::PolicyAssociation resource represents the AWS Security Hub Central Configuration Policy associations in your Target. Only the AWS Security Hub delegated administrator can create the resouce from the home region.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securityhub.policy_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "association_identifier",
-    "type": "string",
-    "description": "A unique identifier to indicates if the target has an association"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>policy_associations</code> in a region.
-```sql
-SELECT
-region,
-association_identifier
-FROM awscc.securityhub.policy_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>policy_associations_list_only</code> resource, see <a href="/services/securityhub/policy_associations/#permissions"><code>policy_associations</code></a>
-
diff --git a/website/docs/services/securityhub/product_subscriptions/index.md b/website/docs/services/securityhub/product_subscriptions/index.md
index 741d3636d..7b4a57455 100644
--- a/website/docs/services/securityhub/product_subscriptions/index.md
+++ b/website/docs/services/securityhub/product_subscriptions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>product_subscription</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "product_arn",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>product_subscription</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "product_subscription_arn",
+    "type": "string",
+    "description": "The ARN of the product subscription for the account"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-productsubscription.html"><code>AWS::SecurityHub::ProductSubscription</code></a>.
 
@@ -59,26 +85,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>product_subscriptions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ProductArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>product_subscriptions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>product_subscriptions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>product_subscriptions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -87,6 +118,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>product_subscription</code>.
 ```sql
 SELECT
@@ -96,6 +136,19 @@ product_subscription_arn
 FROM awscc.securityhub.product_subscriptions
 WHERE region = 'us-east-1' AND data__Identifier = '<ProductSubscriptionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>product_subscriptions</code> in a region.
+```sql
+SELECT
+region,
+product_subscription_arn
+FROM awscc.securityhub.product_subscriptions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -156,6 +209,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securityhub/product_subscriptions_list_only/index.md b/website/docs/services/securityhub/product_subscriptions_list_only/index.md
deleted file mode 100644
index 2fc41bf12..000000000
--- a/website/docs/services/securityhub/product_subscriptions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: product_subscriptions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - product_subscriptions_list_only
-  - securityhub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>product_subscriptions</code> in a region or regions, for all properties use <a href="/services/securityhub/product_subscriptions/"><code>product_subscriptions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>product_subscriptions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::SecurityHub::ProductSubscription resource represents a subscription to a service that is allowed to generate findings for your Security Hub account. One product subscription resource is created for each product enabled.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securityhub.product_subscriptions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "product_subscription_arn",
-    "type": "string",
-    "description": "The ARN of the product subscription for the account"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>product_subscriptions</code> in a region.
-```sql
-SELECT
-region,
-product_subscription_arn
-FROM awscc.securityhub.product_subscriptions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>product_subscriptions_list_only</code> resource, see <a href="/services/securityhub/product_subscriptions/#permissions"><code>product_subscriptions</code></a>
-
diff --git a/website/docs/services/securityhub/security_controls/index.md b/website/docs/services/securityhub/security_controls/index.md
index d92b55b8b..5572f4b78 100644
--- a/website/docs/services/securityhub/security_controls/index.md
+++ b/website/docs/services/securityhub/security_controls/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>security_control</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "security_control_id",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets a <code>security_control</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "security_control_id",
+    "type": "string",
+    "description": "The unique identifier of a security control across standards. Values for this field typically consist of an AWS service name and a number, such as APIGateway.3."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-securitycontrol.html"><code>AWS::SecurityHub::SecurityControl</code></a>.
 
@@ -64,31 +90,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>security_controls</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Parameters, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>security_controls</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>security_controls</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>security_controls_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>security_controls</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +129,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>security_control</code>.
 ```sql
 SELECT
@@ -108,6 +149,19 @@ parameters
 FROM awscc.securityhub.security_controls
 WHERE region = 'us-east-1' AND data__Identifier = '<SecurityControlId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>security_controls</code> in a region.
+```sql
+SELECT
+region,
+security_control_id
+FROM awscc.securityhub.security_controls_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -180,6 +234,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.securityhub.security_controls
+SET data__PatchDocument = string('{{ {
+    "SecurityControlArn": security_control_arn,
+    "LastUpdateReason": last_update_reason,
+    "Parameters": parameters
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SecurityControlId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securityhub/security_controls_list_only/index.md b/website/docs/services/securityhub/security_controls_list_only/index.md
deleted file mode 100644
index c057c4a7f..000000000
--- a/website/docs/services/securityhub/security_controls_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: security_controls_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - security_controls_list_only
-  - securityhub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>security_controls</code> in a region or regions, for all properties use <a href="/services/securityhub/security_controls/"><code>security_controls</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>security_controls_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A security control in Security Hub describes a security best practice related to a specific resource.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securityhub.security_controls_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "security_control_id",
-    "type": "string",
-    "description": "The unique identifier of a security control across standards. Values for this field typically consist of an AWS service name and a number, such as APIGateway.3."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>security_controls</code> in a region.
-```sql
-SELECT
-region,
-security_control_id
-FROM awscc.securityhub.security_controls_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>security_controls_list_only</code> resource, see <a href="/services/securityhub/security_controls/#permissions"><code>security_controls</code></a>
-
diff --git a/website/docs/services/securityhub/standards/index.md b/website/docs/services/securityhub/standards/index.md
index 4512226ce..2528dfc64 100644
--- a/website/docs/services/securityhub/standards/index.md
+++ b/website/docs/services/securityhub/standards/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>standard</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "standards_subscription_arn",
@@ -67,6 +76,23 @@ Creates, updates, deletes or gets a <code>standard</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "standards_subscription_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-standard.html"><code>AWS::SecurityHub::Standard</code></a>.
 
@@ -76,31 +102,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>standards</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="StandardsArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>standards</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>standards</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>standards_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>standards</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -109,6 +141,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>standard</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ disabled_standards_controls
 FROM awscc.securityhub.standards
 WHERE region = 'us-east-1' AND data__Identifier = '<StandardsSubscriptionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>standards</code> in a region.
+```sql
+SELECT
+region,
+standards_subscription_arn
+FROM awscc.securityhub.standards_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -185,6 +239,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.securityhub.standards
+SET data__PatchDocument = string('{{ {
+    "DisabledStandardsControls": disabled_standards_controls
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<StandardsSubscriptionArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securityhub/standards_list_only/index.md b/website/docs/services/securityhub/standards_list_only/index.md
deleted file mode 100644
index 96a2e2863..000000000
--- a/website/docs/services/securityhub/standards_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: standards_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - standards_list_only
-  - securityhub
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>standards</code> in a region or regions, for all properties use <a href="/services/securityhub/standards/"><code>standards</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>standards_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::SecurityHub::Standard&#96;&#96; resource specifies the enablement of a security standard. The standard is identified by the &#96;&#96;StandardsArn&#96;&#96; property. To view a list of ASH standards and their Amazon Resource Names (ARNs), use the &#91;DescribeStandards&#93;(https://docs.aws.amazon.com/securityhub/1.0/APIReference/API&#95;DescribeStandards.html) API operation.<br />You must create a separate &#96;&#96;AWS::SecurityHub::Standard&#96;&#96; resource for each standard that you want to enable.<br />For more information about ASH standards, see &#91;standards reference&#93;(https://docs.aws.amazon.com/securityhub/latest/userguide/standards-reference.html) in the &#42;User Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securityhub.standards_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "standards_subscription_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>standards</code> in a region.
-```sql
-SELECT
-region,
-standards_subscription_arn
-FROM awscc.securityhub.standards_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>standards_list_only</code> resource, see <a href="/services/securityhub/standards/#permissions"><code>standards</code></a>
-
diff --git a/website/docs/services/securitylake/data_lakes/index.md b/website/docs/services/securitylake/data_lakes/index.md
index a3e177a3d..280333d55 100644
--- a/website/docs/services/securitylake/data_lakes/index.md
+++ b/website/docs/services/securitylake/data_lakes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_lake</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "encryption_configuration",
@@ -137,6 +146,23 @@ Creates, updates, deletes or gets a <code>data_lake</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) created by you to provide to the subscriber."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securitylake-datalake.html"><code>AWS::SecurityLake::DataLake</code></a>.
 
@@ -146,31 +172,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_lakes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_lakes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_lakes</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_lakes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_lakes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -179,6 +211,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_lake</code>.
 ```sql
 SELECT
@@ -193,6 +234,19 @@ s3_bucket_arn
 FROM awscc.securitylake.data_lakes
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_lakes</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.securitylake.data_lakes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -288,6 +342,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.securitylake.data_lakes
+SET data__PatchDocument = string('{{ {
+    "EncryptionConfiguration": encryption_configuration,
+    "LifecycleConfiguration": lifecycle_configuration,
+    "ReplicationConfiguration": replication_configuration,
+    "MetaStoreManagerRoleArn": meta_store_manager_role_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securitylake/data_lakes_list_only/index.md b/website/docs/services/securitylake/data_lakes_list_only/index.md
deleted file mode 100644
index f08bd027c..000000000
--- a/website/docs/services/securitylake/data_lakes_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: data_lakes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_lakes_list_only
-  - securitylake
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_lakes</code> in a region or regions, for all properties use <a href="/services/securitylake/data_lakes/"><code>data_lakes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_lakes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SecurityLake::DataLake</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securitylake.data_lakes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) created by you to provide to the subscriber."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_lakes</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.securitylake.data_lakes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_lakes_list_only</code> resource, see <a href="/services/securitylake/data_lakes/#permissions"><code>data_lakes</code></a>
-
diff --git a/website/docs/services/securitylake/index.md b/website/docs/services/securitylake/index.md
index 378bf53ed..6c9143b06 100644
--- a/website/docs/services/securitylake/index.md
+++ b/website/docs/services/securitylake/index.md
@@ -20,7 +20,7 @@ The securitylake service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The securitylake service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/securitylake/data_lakes/">data_lakes</a><br />
-<a href="/services/securitylake/data_lakes_list_only/">data_lakes_list_only</a><br />
 <a href="/services/securitylake/subscriber_notifications/">subscriber_notifications</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/securitylake/subscriber_notifications_list_only/">subscriber_notifications_list_only</a><br />
-<a href="/services/securitylake/subscribers/">subscribers</a><br />
-<a href="/services/securitylake/subscribers_list_only/">subscribers_list_only</a>
+<a href="/services/securitylake/subscribers/">subscribers</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/securitylake/subscriber_notifications/index.md b/website/docs/services/securitylake/subscriber_notifications/index.md
index ada6d00fd..6bdfa0848 100644
--- a/website/docs/services/securitylake/subscriber_notifications/index.md
+++ b/website/docs/services/securitylake/subscriber_notifications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>subscriber_notification</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "notification_configuration",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets a <code>subscriber_notification</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "subscriber_arn",
+    "type": "string",
+    "description": "The ARN for the subscriber"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securitylake-subscribernotification.html"><code>AWS::SecurityLake::SubscriberNotification</code></a>.
 
@@ -103,31 +129,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>subscriber_notifications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SubscriberArn, NotificationConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>subscriber_notifications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>subscriber_notifications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>subscriber_notifications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>subscriber_notifications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>subscriber_notification</code>.
 ```sql
 SELECT
@@ -146,6 +187,19 @@ subscriber_endpoint
 FROM awscc.securitylake.subscriber_notifications
 WHERE region = 'us-east-1' AND data__Identifier = '<SubscriberArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>subscriber_notifications</code> in a region.
+```sql
+SELECT
+region,
+subscriber_arn
+FROM awscc.securitylake.subscriber_notifications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.securitylake.subscriber_notifications
+SET data__PatchDocument = string('{{ {
+    "NotificationConfiguration": notification_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SubscriberArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securitylake/subscriber_notifications_list_only/index.md b/website/docs/services/securitylake/subscriber_notifications_list_only/index.md
deleted file mode 100644
index c4bf786ae..000000000
--- a/website/docs/services/securitylake/subscriber_notifications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: subscriber_notifications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - subscriber_notifications_list_only
-  - securitylake
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>subscriber_notifications</code> in a region or regions, for all properties use <a href="/services/securitylake/subscriber_notifications/"><code>subscriber_notifications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>subscriber_notifications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SecurityLake::SubscriberNotification</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securitylake.subscriber_notifications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "subscriber_arn",
-    "type": "string",
-    "description": "The ARN for the subscriber"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>subscriber_notifications</code> in a region.
-```sql
-SELECT
-region,
-subscriber_arn
-FROM awscc.securitylake.subscriber_notifications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>subscriber_notifications_list_only</code> resource, see <a href="/services/securitylake/subscriber_notifications/#permissions"><code>subscriber_notifications</code></a>
-
diff --git a/website/docs/services/securitylake/subscribers/index.md b/website/docs/services/securitylake/subscribers/index.md
index f099805b8..42f3f7c5f 100644
--- a/website/docs/services/securitylake/subscribers/index.md
+++ b/website/docs/services/securitylake/subscribers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>subscriber</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "access_types",
@@ -160,6 +169,23 @@ Creates, updates, deletes or gets a <code>subscriber</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "subscriber_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securitylake-subscriber.html"><code>AWS::SecurityLake::Subscriber</code></a>.
 
@@ -169,31 +195,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>subscribers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AccessTypes, DataLakeArn, Sources, SubscriberIdentity, SubscriberName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>subscribers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>subscribers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>subscribers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>subscribers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -202,6 +234,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>subscriber</code>.
 ```sql
 SELECT
@@ -221,6 +262,19 @@ subscriber_arn
 FROM awscc.securitylake.subscribers
 WHERE region = 'us-east-1' AND data__Identifier = '<SubscriberArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>subscribers</code> in a region.
+```sql
+SELECT
+region,
+subscriber_arn
+FROM awscc.securitylake.subscribers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -319,6 +373,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.securitylake.subscribers
+SET data__PatchDocument = string('{{ {
+    "AccessTypes": access_types,
+    "SubscriberIdentity": subscriber_identity,
+    "SubscriberName": subscriber_name,
+    "SubscriberDescription": subscriber_description,
+    "Tags": tags,
+    "Sources": sources
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SubscriberArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/securitylake/subscribers_list_only/index.md b/website/docs/services/securitylake/subscribers_list_only/index.md
deleted file mode 100644
index d6b651cb1..000000000
--- a/website/docs/services/securitylake/subscribers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: subscribers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - subscribers_list_only
-  - securitylake
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>subscribers</code> in a region or regions, for all properties use <a href="/services/securitylake/subscribers/"><code>subscribers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>subscribers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SecurityLake::Subscriber</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securitylake.subscribers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "subscriber_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>subscribers</code> in a region.
-```sql
-SELECT
-region,
-subscriber_arn
-FROM awscc.securitylake.subscribers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>subscribers_list_only</code> resource, see <a href="/services/securitylake/subscribers/#permissions"><code>subscribers</code></a>
-
diff --git a/website/docs/services/servicecatalog/cloud_formation_provisioned_products/index.md b/website/docs/services/servicecatalog/cloud_formation_provisioned_products/index.md
index 8095b8b6a..4481de6f8 100644
--- a/website/docs/services/servicecatalog/cloud_formation_provisioned_products/index.md
+++ b/website/docs/services/servicecatalog/cloud_formation_provisioned_products/index.md
@@ -381,6 +381,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.servicecatalog.cloud_formation_provisioned_products
+SET data__PatchDocument = string('{{ {
+    "AcceptLanguage": accept_language,
+    "PathId": path_id,
+    "PathName": path_name,
+    "ProductId": product_id,
+    "ProductName": product_name,
+    "ProvisioningArtifactId": provisioning_artifact_id,
+    "ProvisioningArtifactName": provisioning_artifact_name,
+    "ProvisioningParameters": provisioning_parameters,
+    "ProvisioningPreferences": provisioning_preferences,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ProvisionedProductId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/servicecatalog/index.md b/website/docs/services/servicecatalog/index.md
index 2bb55d957..96308440c 100644
--- a/website/docs/services/servicecatalog/index.md
+++ b/website/docs/services/servicecatalog/index.md
@@ -20,7 +20,7 @@ The servicecatalog service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>14</b></span><br />
+<span>total resources:&nbsp;<b>11</b></span><br />
 </div>
 </div>
 
@@ -34,16 +34,13 @@ The servicecatalog service documentation.
 <a href="/services/servicecatalog/launch_template_constraints/">launch_template_constraints</a><br />
 <a href="/services/servicecatalog/portfolio_principal_associations/">portfolio_principal_associations</a><br />
 <a href="/services/servicecatalog/portfolio_product_associations/">portfolio_product_associations</a><br />
-<a href="/services/servicecatalog/portfolio_shares/">portfolio_shares</a><br />
-<a href="/services/servicecatalog/resource_update_constraints/">resource_update_constraints</a>
+<a href="/services/servicecatalog/portfolio_shares/">portfolio_shares</a>
 </div>
 <div class="providerDocColumn">
+<a href="/services/servicecatalog/resource_update_constraints/">resource_update_constraints</a><br />
 <a href="/services/servicecatalog/service_action_associations/">service_action_associations</a><br />
-<a href="/services/servicecatalog/service_action_associations_list_only/">service_action_associations_list_only</a><br />
 <a href="/services/servicecatalog/service_actions/">service_actions</a><br />
-<a href="/services/servicecatalog/service_actions_list_only/">service_actions_list_only</a><br />
 <a href="/services/servicecatalog/tag_option_associations/">tag_option_associations</a><br />
-<a href="/services/servicecatalog/tag_options/">tag_options</a><br />
-<a href="/services/servicecatalog/tag_options_list_only/">tag_options_list_only</a>
+<a href="/services/servicecatalog/tag_options/">tag_options</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/servicecatalog/launch_notification_constraints/index.md b/website/docs/services/servicecatalog/launch_notification_constraints/index.md
index 226c15884..a97fb25f2 100644
--- a/website/docs/services/servicecatalog/launch_notification_constraints/index.md
+++ b/website/docs/services/servicecatalog/launch_notification_constraints/index.md
@@ -90,3 +90,4 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 
 
+
diff --git a/website/docs/services/servicecatalog/launch_template_constraints/index.md b/website/docs/services/servicecatalog/launch_template_constraints/index.md
index 7a9ba86d6..f21c14de7 100644
--- a/website/docs/services/servicecatalog/launch_template_constraints/index.md
+++ b/website/docs/services/servicecatalog/launch_template_constraints/index.md
@@ -90,3 +90,4 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 
 
+
diff --git a/website/docs/services/servicecatalog/portfolio_principal_associations/index.md b/website/docs/services/servicecatalog/portfolio_principal_associations/index.md
index ffd18e512..dd51bcfbf 100644
--- a/website/docs/services/servicecatalog/portfolio_principal_associations/index.md
+++ b/website/docs/services/servicecatalog/portfolio_principal_associations/index.md
@@ -85,3 +85,4 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 
 
+
diff --git a/website/docs/services/servicecatalog/portfolio_product_associations/index.md b/website/docs/services/servicecatalog/portfolio_product_associations/index.md
index 1fa17edf7..d82fd498f 100644
--- a/website/docs/services/servicecatalog/portfolio_product_associations/index.md
+++ b/website/docs/services/servicecatalog/portfolio_product_associations/index.md
@@ -85,3 +85,4 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 
 
+
diff --git a/website/docs/services/servicecatalog/portfolio_shares/index.md b/website/docs/services/servicecatalog/portfolio_shares/index.md
index a4554f612..16380ffee 100644
--- a/website/docs/services/servicecatalog/portfolio_shares/index.md
+++ b/website/docs/services/servicecatalog/portfolio_shares/index.md
@@ -85,3 +85,4 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 
 
+
diff --git a/website/docs/services/servicecatalog/resource_update_constraints/index.md b/website/docs/services/servicecatalog/resource_update_constraints/index.md
index 52a3701fd..98296b6bf 100644
--- a/website/docs/services/servicecatalog/resource_update_constraints/index.md
+++ b/website/docs/services/servicecatalog/resource_update_constraints/index.md
@@ -90,3 +90,4 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 
 
+
diff --git a/website/docs/services/servicecatalog/service_action_associations/index.md b/website/docs/services/servicecatalog/service_action_associations/index.md
index 3868d82e1..8677ca45e 100644
--- a/website/docs/services/servicecatalog/service_action_associations/index.md
+++ b/website/docs/services/servicecatalog/service_action_associations/index.md
@@ -33,6 +33,40 @@ Creates, updates, deletes or gets a <code>service_action_association</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "product_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "provisioning_artifact_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "service_action_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "product_id",
@@ -55,6 +89,8 @@ Creates, updates, deletes or gets a <code>service_action_association</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-serviceactionassociation.html"><code>AWS::ServiceCatalog::ServiceActionAssociation</code></a>.
 
@@ -64,26 +100,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>service_action_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ProductId, ProvisioningArtifactId, ServiceActionId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>service_action_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>service_action_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>service_action_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +133,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>service_action_association</code>.
 ```sql
 SELECT
@@ -102,6 +152,21 @@ service_action_id
 FROM awscc.servicecatalog.service_action_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<ProductId>|<ProvisioningArtifactId>|<ServiceActionId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>service_action_associations</code> in a region.
+```sql
+SELECT
+region,
+product_id,
+provisioning_artifact_id,
+service_action_id
+FROM awscc.servicecatalog.service_action_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -174,6 +239,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/servicecatalog/service_action_associations_list_only/index.md b/website/docs/services/servicecatalog/service_action_associations_list_only/index.md
deleted file mode 100644
index e7a044116..000000000
--- a/website/docs/services/servicecatalog/service_action_associations_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: service_action_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - service_action_associations_list_only
-  - servicecatalog
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>service_action_associations</code> in a region or regions, for all properties use <a href="/services/servicecatalog/service_action_associations/"><code>service_action_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>service_action_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema for AWS::ServiceCatalog::ServiceActionAssociation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.servicecatalog.service_action_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "product_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "provisioning_artifact_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "service_action_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>service_action_associations</code> in a region.
-```sql
-SELECT
-region,
-product_id,
-provisioning_artifact_id,
-service_action_id
-FROM awscc.servicecatalog.service_action_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>service_action_associations_list_only</code> resource, see <a href="/services/servicecatalog/service_action_associations/#permissions"><code>service_action_associations</code></a>
-
diff --git a/website/docs/services/servicecatalog/service_actions/index.md b/website/docs/services/servicecatalog/service_actions/index.md
index 95c88ad76..ddf8f1da9 100644
--- a/website/docs/services/servicecatalog/service_actions/index.md
+++ b/website/docs/services/servicecatalog/service_actions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>service_action</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "accept_language",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>service_action</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-serviceaction.html"><code>AWS::ServiceCatalog::ServiceAction</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>service_actions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, DefinitionType, Definition, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>service_actions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>service_actions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>service_actions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>service_actions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>service_action</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ id
 FROM awscc.servicecatalog.service_actions
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>service_actions</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.servicecatalog.service_actions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.servicecatalog.service_actions
+SET data__PatchDocument = string('{{ {
+    "AcceptLanguage": accept_language,
+    "Name": name,
+    "DefinitionType": definition_type,
+    "Definition": definition,
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/servicecatalog/service_actions_list_only/index.md b/website/docs/services/servicecatalog/service_actions_list_only/index.md
deleted file mode 100644
index 7aa77210a..000000000
--- a/website/docs/services/servicecatalog/service_actions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: service_actions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - service_actions_list_only
-  - servicecatalog
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>service_actions</code> in a region or regions, for all properties use <a href="/services/servicecatalog/service_actions/"><code>service_actions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>service_actions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema for AWS::ServiceCatalog::ServiceAction</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.servicecatalog.service_actions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>service_actions</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.servicecatalog.service_actions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>service_actions_list_only</code> resource, see <a href="/services/servicecatalog/service_actions/#permissions"><code>service_actions</code></a>
-
diff --git a/website/docs/services/servicecatalog/tag_option_associations/index.md b/website/docs/services/servicecatalog/tag_option_associations/index.md
index b61743ea6..3041ec72c 100644
--- a/website/docs/services/servicecatalog/tag_option_associations/index.md
+++ b/website/docs/services/servicecatalog/tag_option_associations/index.md
@@ -75,3 +75,4 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 
 
+
diff --git a/website/docs/services/servicecatalog/tag_options/index.md b/website/docs/services/servicecatalog/tag_options/index.md
index 352d7e822..be745ea1c 100644
--- a/website/docs/services/servicecatalog/tag_options/index.md
+++ b/website/docs/services/servicecatalog/tag_options/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>tag_option</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets a <code>tag_option</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The TagOption identifier."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-tagoption.html"><code>AWS::ServiceCatalog::TagOption</code></a>.
 
@@ -69,31 +95,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>tag_options</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Value, Key, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>tag_options</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>tag_options</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>tag_options_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>tag_options</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +134,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>tag_option</code>.
 ```sql
 SELECT
@@ -113,6 +154,19 @@ key
 FROM awscc.servicecatalog.tag_options
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>tag_options</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.servicecatalog.tag_options_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -183,6 +237,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.servicecatalog.tag_options
+SET data__PatchDocument = string('{{ {
+    "Active": active
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/servicecatalog/tag_options_list_only/index.md b/website/docs/services/servicecatalog/tag_options_list_only/index.md
deleted file mode 100644
index eacd8a344..000000000
--- a/website/docs/services/servicecatalog/tag_options_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: tag_options_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - tag_options_list_only
-  - servicecatalog
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>tag_options</code> in a region or regions, for all properties use <a href="/services/servicecatalog/tag_options/"><code>tag_options</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>tag_options_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::ServiceCatalog::TagOption</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.servicecatalog.tag_options_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The TagOption identifier."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>tag_options</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.servicecatalog.tag_options_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>tag_options_list_only</code> resource, see <a href="/services/servicecatalog/tag_options/#permissions"><code>tag_options</code></a>
-
diff --git a/website/docs/services/servicecatalogappregistry/applications/index.md b/website/docs/services/servicecatalogappregistry/applications/index.md
index 45681a372..1aafd8688 100644
--- a/website/docs/services/servicecatalogappregistry/applications/index.md
+++ b/website/docs/services/servicecatalogappregistry/applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -80,6 +89,23 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-application.html"><code>AWS::ServiceCatalogAppRegistry::Application</code></a>.
 
@@ -89,31 +115,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -122,6 +154,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ application_name
 FROM awscc.servicecatalogappregistry.applications
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>applications</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.servicecatalogappregistry.applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +259,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.servicecatalogappregistry.applications
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/servicecatalogappregistry/applications_list_only/index.md b/website/docs/services/servicecatalogappregistry/applications_list_only/index.md
deleted file mode 100644
index 3ebca9950..000000000
--- a/website/docs/services/servicecatalogappregistry/applications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - applications_list_only
-  - servicecatalogappregistry
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>applications</code> in a region or regions, for all properties use <a href="/services/servicecatalogappregistry/applications/"><code>applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema for AWS::ServiceCatalogAppRegistry::Application</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.servicecatalogappregistry.applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>applications</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.servicecatalogappregistry.applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>applications_list_only</code> resource, see <a href="/services/servicecatalogappregistry/applications/#permissions"><code>applications</code></a>
-
diff --git a/website/docs/services/servicecatalogappregistry/attribute_group_associations/index.md b/website/docs/services/servicecatalogappregistry/attribute_group_associations/index.md
index e0ef7cc80..f24b6a1e4 100644
--- a/website/docs/services/servicecatalogappregistry/attribute_group_associations/index.md
+++ b/website/docs/services/servicecatalogappregistry/attribute_group_associations/index.md
@@ -33,6 +33,45 @@ Creates, updates, deletes or gets an <code>attribute_group_association</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "application",
+    "type": "string",
+    "description": "The name or the Id of the Application."
+  },
+  {
+    "name": "attribute_group",
+    "type": "string",
+    "description": "The name or the Id of the AttributeGroup."
+  },
+  {
+    "name": "application_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "attribute_group_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "application",
@@ -60,6 +99,8 @@ Creates, updates, deletes or gets an <code>attribute_group_association</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-attributegroupassociation.html"><code>AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation</code></a>.
 
@@ -69,26 +110,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>attribute_group_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Application, AttributeGroup, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>attribute_group_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>attribute_group_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>attribute_group_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +143,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>attribute_group_association</code>.
 ```sql
 SELECT
@@ -108,6 +163,20 @@ attribute_group_arn
 FROM awscc.servicecatalogappregistry.attribute_group_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationArn>|<AttributeGroupArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>attribute_group_associations</code> in a region.
+```sql
+SELECT
+region,
+application_arn,
+attribute_group_arn
+FROM awscc.servicecatalogappregistry.attribute_group_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -174,6 +243,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/servicecatalogappregistry/attribute_group_associations_list_only/index.md b/website/docs/services/servicecatalogappregistry/attribute_group_associations_list_only/index.md
deleted file mode 100644
index 5b4cc3426..000000000
--- a/website/docs/services/servicecatalogappregistry/attribute_group_associations_list_only/index.md
+++ /dev/null
@@ -1,96 +0,0 @@
----
-title: attribute_group_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - attribute_group_associations_list_only
-  - servicecatalogappregistry
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>attribute_group_associations</code> in a region or regions, for all properties use <a href="/services/servicecatalogappregistry/attribute_group_associations/"><code>attribute_group_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>attribute_group_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema for AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.servicecatalogappregistry.attribute_group_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application",
-    "type": "string",
-    "description": "The name or the Id of the Application."
-  },
-  {
-    "name": "attribute_group",
-    "type": "string",
-    "description": "The name or the Id of the AttributeGroup."
-  },
-  {
-    "name": "application_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "attribute_group_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>attribute_group_associations</code> in a region.
-```sql
-SELECT
-region,
-application_arn,
-attribute_group_arn
-FROM awscc.servicecatalogappregistry.attribute_group_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>attribute_group_associations_list_only</code> resource, see <a href="/services/servicecatalogappregistry/attribute_group_associations/#permissions"><code>attribute_group_associations</code></a>
-
diff --git a/website/docs/services/servicecatalogappregistry/attribute_groups/index.md b/website/docs/services/servicecatalogappregistry/attribute_groups/index.md
index 3758cff94..837c8e3fe 100644
--- a/website/docs/services/servicecatalogappregistry/attribute_groups/index.md
+++ b/website/docs/services/servicecatalogappregistry/attribute_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>attribute_group</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -70,6 +79,23 @@ Creates, updates, deletes or gets an <code>attribute_group</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-attributegroup.html"><code>AWS::ServiceCatalogAppRegistry::AttributeGroup</code></a>.
 
@@ -79,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>attribute_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Attributes, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>attribute_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>attribute_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>attribute_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>attribute_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>attribute_group</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ tags
 FROM awscc.servicecatalogappregistry.attribute_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>attribute_groups</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.servicecatalogappregistry.attribute_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -199,6 +253,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.servicecatalogappregistry.attribute_groups
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "Attributes": attributes,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/servicecatalogappregistry/attribute_groups_list_only/index.md b/website/docs/services/servicecatalogappregistry/attribute_groups_list_only/index.md
deleted file mode 100644
index 33eb50284..000000000
--- a/website/docs/services/servicecatalogappregistry/attribute_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: attribute_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - attribute_groups_list_only
-  - servicecatalogappregistry
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>attribute_groups</code> in a region or regions, for all properties use <a href="/services/servicecatalogappregistry/attribute_groups/"><code>attribute_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>attribute_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema for AWS::ServiceCatalogAppRegistry::AttributeGroup.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.servicecatalogappregistry.attribute_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>attribute_groups</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.servicecatalogappregistry.attribute_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>attribute_groups_list_only</code> resource, see <a href="/services/servicecatalogappregistry/attribute_groups/#permissions"><code>attribute_groups</code></a>
-
diff --git a/website/docs/services/servicecatalogappregistry/index.md b/website/docs/services/servicecatalogappregistry/index.md
index 407934f5a..0cb3d9886 100644
--- a/website/docs/services/servicecatalogappregistry/index.md
+++ b/website/docs/services/servicecatalogappregistry/index.md
@@ -20,7 +20,7 @@ The servicecatalogappregistry service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The servicecatalogappregistry service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/servicecatalogappregistry/applications/">applications</a><br />
-<a href="/services/servicecatalogappregistry/applications_list_only/">applications_list_only</a><br />
-<a href="/services/servicecatalogappregistry/attribute_group_associations/">attribute_group_associations</a><br />
-<a href="/services/servicecatalogappregistry/attribute_group_associations_list_only/">attribute_group_associations_list_only</a>
+<a href="/services/servicecatalogappregistry/attribute_group_associations/">attribute_group_associations</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/servicecatalogappregistry/attribute_groups/">attribute_groups</a><br />
-<a href="/services/servicecatalogappregistry/attribute_groups_list_only/">attribute_groups_list_only</a><br />
-<a href="/services/servicecatalogappregistry/resource_associations/">resource_associations</a><br />
-<a href="/services/servicecatalogappregistry/resource_associations_list_only/">resource_associations_list_only</a>
+<a href="/services/servicecatalogappregistry/resource_associations/">resource_associations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/servicecatalogappregistry/resource_associations/index.md b/website/docs/services/servicecatalogappregistry/resource_associations/index.md
index 6f622a78a..6c3a6510a 100644
--- a/website/docs/services/servicecatalogappregistry/resource_associations/index.md
+++ b/website/docs/services/servicecatalogappregistry/resource_associations/index.md
@@ -33,6 +33,50 @@ Creates, updates, deletes or gets a <code>resource_association</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "application",
+    "type": "string",
+    "description": "The name or the Id of the Application."
+  },
+  {
+    "name": "resource",
+    "type": "string",
+    "description": "The name or the Id of the Resource."
+  },
+  {
+    "name": "resource_type",
+    "type": "string",
+    "description": "The type of the CFN Resource for now it's enum CFN&#95;STACK."
+  },
+  {
+    "name": "application_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "resource_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "application",
@@ -65,6 +109,8 @@ Creates, updates, deletes or gets a <code>resource_association</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-resourceassociation.html"><code>AWS::ServiceCatalogAppRegistry::ResourceAssociation</code></a>.
 
@@ -74,26 +120,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Application, Resource, ResourceType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +153,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_association</code>.
 ```sql
 SELECT
@@ -114,6 +174,21 @@ resource_arn
 FROM awscc.servicecatalogappregistry.resource_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationArn>|<ResourceArn>|<ResourceType>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_associations</code> in a region.
+```sql
+SELECT
+region,
+application_arn,
+resource_arn,
+resource_type
+FROM awscc.servicecatalogappregistry.resource_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -186,6 +261,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/servicecatalogappregistry/resource_associations_list_only/index.md b/website/docs/services/servicecatalogappregistry/resource_associations_list_only/index.md
deleted file mode 100644
index e57b7ed58..000000000
--- a/website/docs/services/servicecatalogappregistry/resource_associations_list_only/index.md
+++ /dev/null
@@ -1,102 +0,0 @@
----
-title: resource_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_associations_list_only
-  - servicecatalogappregistry
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_associations</code> in a region or regions, for all properties use <a href="/services/servicecatalogappregistry/resource_associations/"><code>resource_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Schema for AWS::ServiceCatalogAppRegistry::ResourceAssociation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.servicecatalogappregistry.resource_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application",
-    "type": "string",
-    "description": "The name or the Id of the Application."
-  },
-  {
-    "name": "resource",
-    "type": "string",
-    "description": "The name or the Id of the Resource."
-  },
-  {
-    "name": "resource_type",
-    "type": "string",
-    "description": "The type of the CFN Resource for now it's enum CFN&#95;STACK."
-  },
-  {
-    "name": "application_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "resource_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_associations</code> in a region.
-```sql
-SELECT
-region,
-application_arn,
-resource_arn,
-resource_type
-FROM awscc.servicecatalogappregistry.resource_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_associations_list_only</code> resource, see <a href="/services/servicecatalogappregistry/resource_associations/#permissions"><code>resource_associations</code></a>
-
diff --git a/website/docs/services/ses/configuration_set_event_destinations/index.md b/website/docs/services/ses/configuration_set_event_destinations/index.md
index 4e99360e4..82a131a1d 100644
--- a/website/docs/services/ses/configuration_set_event_destinations/index.md
+++ b/website/docs/services/ses/configuration_set_event_destinations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>configuration_set_event_destination</c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -142,6 +151,23 @@ Creates, updates, deletes or gets a <code>configuration_set_event_destination</c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-configurationseteventdestination.html"><code>AWS::SES::ConfigurationSetEventDestination</code></a>.
 
@@ -151,31 +177,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>configuration_set_event_destinations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConfigurationSetName, EventDestination, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>configuration_set_event_destinations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>configuration_set_event_destinations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>configuration_set_event_destinations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>configuration_set_event_destinations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -184,6 +216,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>configuration_set_event_destination</code>.
 ```sql
 SELECT
@@ -194,6 +235,19 @@ event_destination
 FROM awscc.ses.configuration_set_event_destinations
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>configuration_set_event_destinations</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ses.configuration_set_event_destinations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -276,6 +330,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ses.configuration_set_event_destinations
+SET data__PatchDocument = string('{{ {
+    "EventDestination": event_destination
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ses/configuration_set_event_destinations_list_only/index.md b/website/docs/services/ses/configuration_set_event_destinations_list_only/index.md
deleted file mode 100644
index 2b9bb01d2..000000000
--- a/website/docs/services/ses/configuration_set_event_destinations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: configuration_set_event_destinations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - configuration_set_event_destinations_list_only
-  - ses
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>configuration_set_event_destinations</code> in a region or regions, for all properties use <a href="/services/ses/configuration_set_event_destinations/"><code>configuration_set_event_destinations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>configuration_set_event_destinations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SES::ConfigurationSetEventDestination</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ses.configuration_set_event_destinations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>configuration_set_event_destinations</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ses.configuration_set_event_destinations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>configuration_set_event_destinations_list_only</code> resource, see <a href="/services/ses/configuration_set_event_destinations/#permissions"><code>configuration_set_event_destinations</code></a>
-
diff --git a/website/docs/services/ses/configuration_sets/index.md b/website/docs/services/ses/configuration_sets/index.md
index a7fdd4e77..a4c02157b 100644
--- a/website/docs/services/ses/configuration_sets/index.md
+++ b/website/docs/services/ses/configuration_sets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>configuration_set</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -168,6 +177,23 @@ Creates, updates, deletes or gets a <code>configuration_set</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the configuration set."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-configurationset.html"><code>AWS::SES::ConfigurationSet</code></a>.
 
@@ -177,31 +203,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>configuration_sets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>configuration_sets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>configuration_sets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>configuration_sets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>configuration_sets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -210,6 +242,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>configuration_set</code>.
 ```sql
 SELECT
@@ -225,6 +266,19 @@ tags
 FROM awscc.ses.configuration_sets
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>configuration_sets</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.ses.configuration_sets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -342,6 +396,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ses.configuration_sets
+SET data__PatchDocument = string('{{ {
+    "TrackingOptions": tracking_options,
+    "DeliveryOptions": delivery_options,
+    "ReputationOptions": reputation_options,
+    "SendingOptions": sending_options,
+    "SuppressionOptions": suppression_options,
+    "VdmOptions": vdm_options,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ses/configuration_sets_list_only/index.md b/website/docs/services/ses/configuration_sets_list_only/index.md
deleted file mode 100644
index 13c68e892..000000000
--- a/website/docs/services/ses/configuration_sets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: configuration_sets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - configuration_sets_list_only
-  - ses
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>configuration_sets</code> in a region or regions, for all properties use <a href="/services/ses/configuration_sets/"><code>configuration_sets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>configuration_sets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::SES::ConfigurationSet.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ses.configuration_sets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the configuration set."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>configuration_sets</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.ses.configuration_sets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>configuration_sets_list_only</code> resource, see <a href="/services/ses/configuration_sets/#permissions"><code>configuration_sets</code></a>
-
diff --git a/website/docs/services/ses/contact_lists/index.md b/website/docs/services/ses/contact_lists/index.md
index d524eeca4..5deac4f80 100644
--- a/website/docs/services/ses/contact_lists/index.md
+++ b/website/docs/services/ses/contact_lists/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>contact_list</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "contact_list_name",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets a <code>contact_list</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "contact_list_name",
+    "type": "string",
+    "description": "The name of the contact list."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-contactlist.html"><code>AWS::SES::ContactList</code></a>.
 
@@ -103,31 +129,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>contact_lists</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>contact_lists</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>contact_lists</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>contact_lists_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>contact_lists</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>contact_list</code>.
 ```sql
 SELECT
@@ -147,6 +188,19 @@ tags
 FROM awscc.ses.contact_lists
 WHERE region = 'us-east-1' AND data__Identifier = '<ContactListName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>contact_lists</code> in a region.
+```sql
+SELECT
+region,
+contact_list_name
+FROM awscc.ses.contact_lists_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -231,6 +285,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ses.contact_lists
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Topics": topics,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ContactListName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ses/contact_lists_list_only/index.md b/website/docs/services/ses/contact_lists_list_only/index.md
deleted file mode 100644
index 73318dc46..000000000
--- a/website/docs/services/ses/contact_lists_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: contact_lists_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - contact_lists_list_only
-  - ses
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>contact_lists</code> in a region or regions, for all properties use <a href="/services/ses/contact_lists/"><code>contact_lists</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>contact_lists_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::SES::ContactList.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ses.contact_lists_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "contact_list_name",
-    "type": "string",
-    "description": "The name of the contact list."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>contact_lists</code> in a region.
-```sql
-SELECT
-region,
-contact_list_name
-FROM awscc.ses.contact_lists_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>contact_lists_list_only</code> resource, see <a href="/services/ses/contact_lists/#permissions"><code>contact_lists</code></a>
-
diff --git a/website/docs/services/ses/dedicated_ip_pools/index.md b/website/docs/services/ses/dedicated_ip_pools/index.md
index 2af82e581..8e83afd7c 100644
--- a/website/docs/services/ses/dedicated_ip_pools/index.md
+++ b/website/docs/services/ses/dedicated_ip_pools/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>dedicated_ip_pool</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "pool_name",
@@ -67,6 +76,23 @@ Creates, updates, deletes or gets a <code>dedicated_ip_pool</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "pool_name",
+    "type": "string",
+    "description": "The name of the dedicated IP pool."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-dedicatedippool.html"><code>AWS::SES::DedicatedIpPool</code></a>.
 
@@ -76,31 +102,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>dedicated_ip_pools</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>dedicated_ip_pools</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>dedicated_ip_pools</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>dedicated_ip_pools_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>dedicated_ip_pools</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -109,6 +141,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>dedicated_ip_pool</code>.
 ```sql
 SELECT
@@ -119,6 +160,19 @@ tags
 FROM awscc.ses.dedicated_ip_pools
 WHERE region = 'us-east-1' AND data__Identifier = '<PoolName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>dedicated_ip_pools</code> in a region.
+```sql
+SELECT
+region,
+pool_name
+FROM awscc.ses.dedicated_ip_pools_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -193,6 +247,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ses.dedicated_ip_pools
+SET data__PatchDocument = string('{{ {
+    "ScalingMode": scaling_mode,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PoolName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ses/dedicated_ip_pools_list_only/index.md b/website/docs/services/ses/dedicated_ip_pools_list_only/index.md
deleted file mode 100644
index 0abea90d2..000000000
--- a/website/docs/services/ses/dedicated_ip_pools_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: dedicated_ip_pools_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - dedicated_ip_pools_list_only
-  - ses
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>dedicated_ip_pools</code> in a region or regions, for all properties use <a href="/services/ses/dedicated_ip_pools/"><code>dedicated_ip_pools</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>dedicated_ip_pools_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SES::DedicatedIpPool</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ses.dedicated_ip_pools_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "pool_name",
-    "type": "string",
-    "description": "The name of the dedicated IP pool."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>dedicated_ip_pools</code> in a region.
-```sql
-SELECT
-region,
-pool_name
-FROM awscc.ses.dedicated_ip_pools_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>dedicated_ip_pools_list_only</code> resource, see <a href="/services/ses/dedicated_ip_pools/#permissions"><code>dedicated_ip_pools</code></a>
-
diff --git a/website/docs/services/ses/email_identities/index.md b/website/docs/services/ses/email_identities/index.md
index 82ad85866..41556a945 100644
--- a/website/docs/services/ses/email_identities/index.md
+++ b/website/docs/services/ses/email_identities/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>email_identity</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "email_identity",
@@ -167,6 +176,23 @@ Creates, updates, deletes or gets an <code>email_identity</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "email_identity",
+    "type": "string",
+    "description": "The email address or domain to verify."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-emailidentity.html"><code>AWS::SES::EmailIdentity</code></a>.
 
@@ -176,31 +202,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>email_identities</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EmailIdentity, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>email_identities</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>email_identities</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>email_identities_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>email_identities</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -209,6 +241,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>email_identity</code>.
 ```sql
 SELECT
@@ -229,6 +270,19 @@ tags
 FROM awscc.ses.email_identities
 WHERE region = 'us-east-1' AND data__Identifier = '<EmailIdentity>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>email_identities</code> in a region.
+```sql
+SELECT
+region,
+email_identity
+FROM awscc.ses.email_identities_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -323,6 +377,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ses.email_identities
+SET data__PatchDocument = string('{{ {
+    "ConfigurationSetAttributes": configuration_set_attributes,
+    "DkimSigningAttributes": dkim_signing_attributes,
+    "DkimAttributes": dkim_attributes,
+    "MailFromAttributes": mail_from_attributes,
+    "FeedbackAttributes": feedback_attributes,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<EmailIdentity>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ses/email_identities_list_only/index.md b/website/docs/services/ses/email_identities_list_only/index.md
deleted file mode 100644
index 16251f2cb..000000000
--- a/website/docs/services/ses/email_identities_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: email_identities_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - email_identities_list_only
-  - ses
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>email_identities</code> in a region or regions, for all properties use <a href="/services/ses/email_identities/"><code>email_identities</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>email_identities_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SES::EmailIdentity</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ses.email_identities_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "email_identity",
-    "type": "string",
-    "description": "The email address or domain to verify."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>email_identities</code> in a region.
-```sql
-SELECT
-region,
-email_identity
-FROM awscc.ses.email_identities_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>email_identities_list_only</code> resource, see <a href="/services/ses/email_identities/#permissions"><code>email_identities</code></a>
-
diff --git a/website/docs/services/ses/index.md b/website/docs/services/ses/index.md
index a51985645..95c831d12 100644
--- a/website/docs/services/ses/index.md
+++ b/website/docs/services/ses/index.md
@@ -20,7 +20,7 @@ The ses service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>29</b></span><br />
+<span>total resources:&nbsp;<b>15</b></span><br />
 </div>
 </div>
 
@@ -30,35 +30,21 @@ The ses service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/ses/configuration_set_event_destinations/">configuration_set_event_destinations</a><br />
-<a href="/services/ses/configuration_set_event_destinations_list_only/">configuration_set_event_destinations_list_only</a><br />
 <a href="/services/ses/configuration_sets/">configuration_sets</a><br />
-<a href="/services/ses/configuration_sets_list_only/">configuration_sets_list_only</a><br />
 <a href="/services/ses/contact_lists/">contact_lists</a><br />
-<a href="/services/ses/contact_lists_list_only/">contact_lists_list_only</a><br />
 <a href="/services/ses/dedicated_ip_pools/">dedicated_ip_pools</a><br />
-<a href="/services/ses/dedicated_ip_pools_list_only/">dedicated_ip_pools_list_only</a><br />
 <a href="/services/ses/email_identities/">email_identities</a><br />
-<a href="/services/ses/email_identities_list_only/">email_identities_list_only</a><br />
 <a href="/services/ses/mail_manager_addon_instances/">mail_manager_addon_instances</a><br />
-<a href="/services/ses/mail_manager_addon_instances_list_only/">mail_manager_addon_instances_list_only</a><br />
 <a href="/services/ses/mail_manager_addon_subscriptions/">mail_manager_addon_subscriptions</a><br />
-<a href="/services/ses/mail_manager_addon_subscriptions_list_only/">mail_manager_addon_subscriptions_list_only</a><br />
 <a href="/services/ses/mail_manager_address_lists/">mail_manager_address_lists</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/ses/mail_manager_address_lists_list_only/">mail_manager_address_lists_list_only</a><br />
 <a href="/services/ses/mail_manager_archives/">mail_manager_archives</a><br />
-<a href="/services/ses/mail_manager_archives_list_only/">mail_manager_archives_list_only</a><br />
 <a href="/services/ses/mail_manager_ingress_points/">mail_manager_ingress_points</a><br />
-<a href="/services/ses/mail_manager_ingress_points_list_only/">mail_manager_ingress_points_list_only</a><br />
 <a href="/services/ses/mail_manager_relays/">mail_manager_relays</a><br />
-<a href="/services/ses/mail_manager_relays_list_only/">mail_manager_relays_list_only</a><br />
 <a href="/services/ses/mail_manager_rule_sets/">mail_manager_rule_sets</a><br />
-<a href="/services/ses/mail_manager_rule_sets_list_only/">mail_manager_rule_sets_list_only</a><br />
 <a href="/services/ses/mail_manager_traffic_policies/">mail_manager_traffic_policies</a><br />
-<a href="/services/ses/mail_manager_traffic_policies_list_only/">mail_manager_traffic_policies_list_only</a><br />
 <a href="/services/ses/templates/">templates</a><br />
-<a href="/services/ses/templates_list_only/">templates_list_only</a><br />
 <a href="/services/ses/vdm_attributes/">vdm_attributes</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/ses/mail_manager_addon_instances/index.md b/website/docs/services/ses/mail_manager_addon_instances/index.md
index afce3cf33..15dd42a58 100644
--- a/website/docs/services/ses/mail_manager_addon_instances/index.md
+++ b/website/docs/services/ses/mail_manager_addon_instances/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>mail_manager_addon_instance</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "addon_instance_arn",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>mail_manager_addon_instance</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "addon_instance_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageraddoninstance.html"><code>AWS::SES::MailManagerAddonInstance</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>mail_manager_addon_instances</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AddonSubscriptionId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>mail_manager_addon_instances</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>mail_manager_addon_instances</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>mail_manager_addon_instances_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>mail_manager_addon_instances</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>mail_manager_addon_instance</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.ses.mail_manager_addon_instances
 WHERE region = 'us-east-1' AND data__Identifier = '<AddonInstanceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>mail_manager_addon_instances</code> in a region.
+```sql
+SELECT
+region,
+addon_instance_id
+FROM awscc.ses.mail_manager_addon_instances_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -197,6 +251,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ses.mail_manager_addon_instances
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AddonInstanceId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ses/mail_manager_addon_instances_list_only/index.md b/website/docs/services/ses/mail_manager_addon_instances_list_only/index.md
deleted file mode 100644
index ac295d4a5..000000000
--- a/website/docs/services/ses/mail_manager_addon_instances_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: mail_manager_addon_instances_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - mail_manager_addon_instances_list_only
-  - ses
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>mail_manager_addon_instances</code> in a region or regions, for all properties use <a href="/services/ses/mail_manager_addon_instances/"><code>mail_manager_addon_instances</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>mail_manager_addon_instances_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::SES::MailManagerAddonInstance Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ses.mail_manager_addon_instances_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "addon_instance_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>mail_manager_addon_instances</code> in a region.
-```sql
-SELECT
-region,
-addon_instance_id
-FROM awscc.ses.mail_manager_addon_instances_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>mail_manager_addon_instances_list_only</code> resource, see <a href="/services/ses/mail_manager_addon_instances/#permissions"><code>mail_manager_addon_instances</code></a>
-
diff --git a/website/docs/services/ses/mail_manager_addon_subscriptions/index.md b/website/docs/services/ses/mail_manager_addon_subscriptions/index.md
index 7906ef825..4398cfcdd 100644
--- a/website/docs/services/ses/mail_manager_addon_subscriptions/index.md
+++ b/website/docs/services/ses/mail_manager_addon_subscriptions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>mail_manager_addon_subscription</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "addon_name",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>mail_manager_addon_subscription</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "addon_subscription_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageraddonsubscription.html"><code>AWS::SES::MailManagerAddonSubscription</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>mail_manager_addon_subscriptions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AddonName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>mail_manager_addon_subscriptions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>mail_manager_addon_subscriptions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>mail_manager_addon_subscriptions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>mail_manager_addon_subscriptions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>mail_manager_addon_subscription</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ tags
 FROM awscc.ses.mail_manager_addon_subscriptions
 WHERE region = 'us-east-1' AND data__Identifier = '<AddonSubscriptionId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>mail_manager_addon_subscriptions</code> in a region.
+```sql
+SELECT
+region,
+addon_subscription_id
+FROM awscc.ses.mail_manager_addon_subscriptions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -191,6 +245,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ses.mail_manager_addon_subscriptions
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AddonSubscriptionId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ses/mail_manager_addon_subscriptions_list_only/index.md b/website/docs/services/ses/mail_manager_addon_subscriptions_list_only/index.md
deleted file mode 100644
index d7a38a57f..000000000
--- a/website/docs/services/ses/mail_manager_addon_subscriptions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: mail_manager_addon_subscriptions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - mail_manager_addon_subscriptions_list_only
-  - ses
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>mail_manager_addon_subscriptions</code> in a region or regions, for all properties use <a href="/services/ses/mail_manager_addon_subscriptions/"><code>mail_manager_addon_subscriptions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>mail_manager_addon_subscriptions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::SES::MailManagerAddonSubscription Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ses.mail_manager_addon_subscriptions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "addon_subscription_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>mail_manager_addon_subscriptions</code> in a region.
-```sql
-SELECT
-region,
-addon_subscription_id
-FROM awscc.ses.mail_manager_addon_subscriptions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>mail_manager_addon_subscriptions_list_only</code> resource, see <a href="/services/ses/mail_manager_addon_subscriptions/#permissions"><code>mail_manager_addon_subscriptions</code></a>
-
diff --git a/website/docs/services/ses/mail_manager_address_lists/index.md b/website/docs/services/ses/mail_manager_address_lists/index.md
index c2ff9edf1..691db3624 100644
--- a/website/docs/services/ses/mail_manager_address_lists/index.md
+++ b/website/docs/services/ses/mail_manager_address_lists/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>mail_manager_address_list</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "address_list_arn",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>mail_manager_address_list</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "address_list_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageraddresslist.html"><code>AWS::SES::MailManagerAddressList</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>mail_manager_address_lists</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>mail_manager_address_lists</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>mail_manager_address_lists</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>mail_manager_address_lists_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>mail_manager_address_lists</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>mail_manager_address_list</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ tags
 FROM awscc.ses.mail_manager_address_lists
 WHERE region = 'us-east-1' AND data__Identifier = '<AddressListId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>mail_manager_address_lists</code> in a region.
+```sql
+SELECT
+region,
+address_list_id
+FROM awscc.ses.mail_manager_address_lists_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -193,6 +247,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ses.mail_manager_address_lists
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AddressListId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ses/mail_manager_address_lists_list_only/index.md b/website/docs/services/ses/mail_manager_address_lists_list_only/index.md
deleted file mode 100644
index 968797382..000000000
--- a/website/docs/services/ses/mail_manager_address_lists_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: mail_manager_address_lists_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - mail_manager_address_lists_list_only
-  - ses
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>mail_manager_address_lists</code> in a region or regions, for all properties use <a href="/services/ses/mail_manager_address_lists/"><code>mail_manager_address_lists</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>mail_manager_address_lists_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::SES::MailManagerAddressList Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ses.mail_manager_address_lists_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "address_list_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>mail_manager_address_lists</code> in a region.
-```sql
-SELECT
-region,
-address_list_id
-FROM awscc.ses.mail_manager_address_lists_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>mail_manager_address_lists_list_only</code> resource, see <a href="/services/ses/mail_manager_address_lists/#permissions"><code>mail_manager_address_lists</code></a>
-
diff --git a/website/docs/services/ses/mail_manager_archives/index.md b/website/docs/services/ses/mail_manager_archives/index.md
index 4dd9fa042..219ef2745 100644
--- a/website/docs/services/ses/mail_manager_archives/index.md
+++ b/website/docs/services/ses/mail_manager_archives/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>mail_manager_archive</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "archive_arn",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>mail_manager_archive</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "archive_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerarchive.html"><code>AWS::SES::MailManagerArchive</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>mail_manager_archives</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>mail_manager_archives</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>mail_manager_archives</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>mail_manager_archives_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>mail_manager_archives</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>mail_manager_archive</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.ses.mail_manager_archives
 WHERE region = 'us-east-1' AND data__Identifier = '<ArchiveId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>mail_manager_archives</code> in a region.
+```sql
+SELECT
+region,
+archive_id
+FROM awscc.ses.mail_manager_archives_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -223,6 +277,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ses.mail_manager_archives
+SET data__PatchDocument = string('{{ {
+    "ArchiveName": archive_name,
+    "Retention": retention,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ArchiveId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ses/mail_manager_archives_list_only/index.md b/website/docs/services/ses/mail_manager_archives_list_only/index.md
deleted file mode 100644
index 8283d2465..000000000
--- a/website/docs/services/ses/mail_manager_archives_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: mail_manager_archives_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - mail_manager_archives_list_only
-  - ses
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>mail_manager_archives</code> in a region or regions, for all properties use <a href="/services/ses/mail_manager_archives/"><code>mail_manager_archives</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>mail_manager_archives_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::SES::MailManagerArchive Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ses.mail_manager_archives_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "archive_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>mail_manager_archives</code> in a region.
-```sql
-SELECT
-region,
-archive_id
-FROM awscc.ses.mail_manager_archives_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>mail_manager_archives_list_only</code> resource, see <a href="/services/ses/mail_manager_archives/#permissions"><code>mail_manager_archives</code></a>
-
diff --git a/website/docs/services/ses/mail_manager_ingress_points/index.md b/website/docs/services/ses/mail_manager_ingress_points/index.md
index e3e6387d4..8063048ea 100644
--- a/website/docs/services/ses/mail_manager_ingress_points/index.md
+++ b/website/docs/services/ses/mail_manager_ingress_points/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>mail_manager_ingress_point</code> reso
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "a_record",
@@ -112,6 +121,23 @@ Creates, updates, deletes or gets a <code>mail_manager_ingress_point</code> reso
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "ingress_point_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageringresspoint.html"><code>AWS::SES::MailManagerIngressPoint</code></a>.
 
@@ -121,31 +147,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>mail_manager_ingress_points</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, TrafficPolicyId, RuleSetId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>mail_manager_ingress_points</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>mail_manager_ingress_points</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>mail_manager_ingress_points_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>mail_manager_ingress_points</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -154,6 +186,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>mail_manager_ingress_point</code>.
 ```sql
 SELECT
@@ -173,6 +214,19 @@ type
 FROM awscc.ses.mail_manager_ingress_points
 WHERE region = 'us-east-1' AND data__Identifier = '<IngressPointId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>mail_manager_ingress_points</code> in a region.
+```sql
+SELECT
+region,
+ingress_point_id
+FROM awscc.ses.mail_manager_ingress_points_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -267,6 +321,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ses.mail_manager_ingress_points
+SET data__PatchDocument = string('{{ {
+    "TrafficPolicyId": traffic_policy_id,
+    "IngressPointConfiguration": ingress_point_configuration,
+    "IngressPointName": ingress_point_name,
+    "RuleSetId": rule_set_id,
+    "StatusToUpdate": status_to_update,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IngressPointId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ses/mail_manager_ingress_points_list_only/index.md b/website/docs/services/ses/mail_manager_ingress_points_list_only/index.md
deleted file mode 100644
index fa5c14578..000000000
--- a/website/docs/services/ses/mail_manager_ingress_points_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: mail_manager_ingress_points_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - mail_manager_ingress_points_list_only
-  - ses
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>mail_manager_ingress_points</code> in a region or regions, for all properties use <a href="/services/ses/mail_manager_ingress_points/"><code>mail_manager_ingress_points</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>mail_manager_ingress_points_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::SES::MailManagerIngressPoint Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ses.mail_manager_ingress_points_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "ingress_point_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>mail_manager_ingress_points</code> in a region.
-```sql
-SELECT
-region,
-ingress_point_id
-FROM awscc.ses.mail_manager_ingress_points_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>mail_manager_ingress_points_list_only</code> resource, see <a href="/services/ses/mail_manager_ingress_points/#permissions"><code>mail_manager_ingress_points</code></a>
-
diff --git a/website/docs/services/ses/mail_manager_relays/index.md b/website/docs/services/ses/mail_manager_relays/index.md
index 85258ef48..d22c0a856 100644
--- a/website/docs/services/ses/mail_manager_relays/index.md
+++ b/website/docs/services/ses/mail_manager_relays/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>mail_manager_relay</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "authentication",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>mail_manager_relay</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "relay_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerrelay.html"><code>AWS::SES::MailManagerRelay</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>mail_manager_relays</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Authentication, ServerName, ServerPort, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>mail_manager_relays</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>mail_manager_relays</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>mail_manager_relays_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>mail_manager_relays</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>mail_manager_relay</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.ses.mail_manager_relays
 WHERE region = 'us-east-1' AND data__Identifier = '<RelayId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>mail_manager_relays</code> in a region.
+```sql
+SELECT
+region,
+relay_id
+FROM awscc.ses.mail_manager_relays_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -225,6 +279,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ses.mail_manager_relays
+SET data__PatchDocument = string('{{ {
+    "Authentication": authentication,
+    "RelayName": relay_name,
+    "ServerName": server_name,
+    "ServerPort": server_port,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RelayId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ses/mail_manager_relays_list_only/index.md b/website/docs/services/ses/mail_manager_relays_list_only/index.md
deleted file mode 100644
index 0fad5af49..000000000
--- a/website/docs/services/ses/mail_manager_relays_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: mail_manager_relays_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - mail_manager_relays_list_only
-  - ses
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>mail_manager_relays</code> in a region or regions, for all properties use <a href="/services/ses/mail_manager_relays/"><code>mail_manager_relays</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>mail_manager_relays_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::SES::MailManagerRelay Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ses.mail_manager_relays_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "relay_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>mail_manager_relays</code> in a region.
-```sql
-SELECT
-region,
-relay_id
-FROM awscc.ses.mail_manager_relays_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>mail_manager_relays_list_only</code> resource, see <a href="/services/ses/mail_manager_relays/#permissions"><code>mail_manager_relays</code></a>
-
diff --git a/website/docs/services/ses/mail_manager_rule_sets/index.md b/website/docs/services/ses/mail_manager_rule_sets/index.md
index 3d3fdaf24..dc8570462 100644
--- a/website/docs/services/ses/mail_manager_rule_sets/index.md
+++ b/website/docs/services/ses/mail_manager_rule_sets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>mail_manager_rule_set</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "rule_set_arn",
@@ -99,6 +108,23 @@ Creates, updates, deletes or gets a <code>mail_manager_rule_set</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "rule_set_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerruleset.html"><code>AWS::SES::MailManagerRuleSet</code></a>.
 
@@ -108,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>mail_manager_rule_sets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Rules, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>mail_manager_rule_sets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>mail_manager_rule_sets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>mail_manager_rule_sets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>mail_manager_rule_sets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>mail_manager_rule_set</code>.
 ```sql
 SELECT
@@ -153,6 +194,19 @@ tags
 FROM awscc.ses.mail_manager_rule_sets
 WHERE region = 'us-east-1' AND data__Identifier = '<RuleSetId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>mail_manager_rule_sets</code> in a region.
+```sql
+SELECT
+region,
+rule_set_id
+FROM awscc.ses.mail_manager_rule_sets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -230,6 +284,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ses.mail_manager_rule_sets
+SET data__PatchDocument = string('{{ {
+    "RuleSetName": rule_set_name,
+    "Rules": rules,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RuleSetId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ses/mail_manager_rule_sets_list_only/index.md b/website/docs/services/ses/mail_manager_rule_sets_list_only/index.md
deleted file mode 100644
index 774587d48..000000000
--- a/website/docs/services/ses/mail_manager_rule_sets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: mail_manager_rule_sets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - mail_manager_rule_sets_list_only
-  - ses
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>mail_manager_rule_sets</code> in a region or regions, for all properties use <a href="/services/ses/mail_manager_rule_sets/"><code>mail_manager_rule_sets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>mail_manager_rule_sets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::SES::MailManagerRuleSet Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ses.mail_manager_rule_sets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "rule_set_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>mail_manager_rule_sets</code> in a region.
-```sql
-SELECT
-region,
-rule_set_id
-FROM awscc.ses.mail_manager_rule_sets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>mail_manager_rule_sets_list_only</code> resource, see <a href="/services/ses/mail_manager_rule_sets/#permissions"><code>mail_manager_rule_sets</code></a>
-
diff --git a/website/docs/services/ses/mail_manager_traffic_policies/index.md b/website/docs/services/ses/mail_manager_traffic_policies/index.md
index b0cdfe509..d16dbf0c1 100644
--- a/website/docs/services/ses/mail_manager_traffic_policies/index.md
+++ b/website/docs/services/ses/mail_manager_traffic_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>mail_manager_traffic_policy</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "default_action",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets a <code>mail_manager_traffic_policy</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "traffic_policy_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagertrafficpolicy.html"><code>AWS::SES::MailManagerTrafficPolicy</code></a>.
 
@@ -103,31 +129,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>mail_manager_traffic_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DefaultAction, PolicyStatements, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>mail_manager_traffic_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>mail_manager_traffic_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>mail_manager_traffic_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>mail_manager_traffic_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>mail_manager_traffic_policy</code>.
 ```sql
 SELECT
@@ -150,6 +191,19 @@ traffic_policy_name
 FROM awscc.ses.mail_manager_traffic_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<TrafficPolicyId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>mail_manager_traffic_policies</code> in a region.
+```sql
+SELECT
+region,
+traffic_policy_id
+FROM awscc.ses.mail_manager_traffic_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -233,6 +287,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ses.mail_manager_traffic_policies
+SET data__PatchDocument = string('{{ {
+    "DefaultAction": default_action,
+    "MaxMessageSizeBytes": max_message_size_bytes,
+    "PolicyStatements": policy_statements,
+    "Tags": tags,
+    "TrafficPolicyName": traffic_policy_name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TrafficPolicyId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ses/mail_manager_traffic_policies_list_only/index.md b/website/docs/services/ses/mail_manager_traffic_policies_list_only/index.md
deleted file mode 100644
index 1ae579290..000000000
--- a/website/docs/services/ses/mail_manager_traffic_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: mail_manager_traffic_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - mail_manager_traffic_policies_list_only
-  - ses
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>mail_manager_traffic_policies</code> in a region or regions, for all properties use <a href="/services/ses/mail_manager_traffic_policies/"><code>mail_manager_traffic_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>mail_manager_traffic_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::SES::MailManagerTrafficPolicy Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ses.mail_manager_traffic_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "traffic_policy_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>mail_manager_traffic_policies</code> in a region.
-```sql
-SELECT
-region,
-traffic_policy_id
-FROM awscc.ses.mail_manager_traffic_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>mail_manager_traffic_policies_list_only</code> resource, see <a href="/services/ses/mail_manager_traffic_policies/#permissions"><code>mail_manager_traffic_policies</code></a>
-
diff --git a/website/docs/services/ses/templates/index.md b/website/docs/services/ses/templates/index.md
index 2826b5bba..c64079301 100644
--- a/website/docs/services/ses/templates/index.md
+++ b/website/docs/services/ses/templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>template</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -57,6 +66,23 @@ Creates, updates, deletes or gets a <code>template</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-template.html"><code>AWS::SES::Template</code></a>.
 
@@ -66,31 +92,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -99,6 +131,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>template</code>.
 ```sql
 SELECT
@@ -108,6 +149,19 @@ template
 FROM awscc.ses.templates
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>templates</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ses.templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -169,6 +223,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ses/templates_list_only/index.md b/website/docs/services/ses/templates_list_only/index.md
deleted file mode 100644
index c64c93e3e..000000000
--- a/website/docs/services/ses/templates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - templates_list_only
-  - ses
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>templates</code> in a region or regions, for all properties use <a href="/services/ses/templates/"><code>templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SES::Template</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ses.templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>templates</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ses.templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>templates_list_only</code> resource, see <a href="/services/ses/templates/#permissions"><code>templates</code></a>
-
diff --git a/website/docs/services/ses/vdm_attributes/index.md b/website/docs/services/ses/vdm_attributes/index.md
index fe9658c00..d79104e54 100644
--- a/website/docs/services/ses/vdm_attributes/index.md
+++ b/website/docs/services/ses/vdm_attributes/index.md
@@ -184,6 +184,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ses.vdm_attributes
+SET data__PatchDocument = string('{{ {
+    "DashboardAttributes": dashboard_attributes,
+    "GuardianAttributes": guardian_attributes
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<VdmAttributesResourceId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/shield/drt_accesses/index.md b/website/docs/services/shield/drt_accesses/index.md
index d52b1b90f..0857c528a 100644
--- a/website/docs/services/shield/drt_accesses/index.md
+++ b/website/docs/services/shield/drt_accesses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>drt_access</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "account_id",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets a <code>drt_access</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "account_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-shield-drtaccess.html"><code>AWS::Shield::DRTAccess</code></a>.
 
@@ -64,31 +90,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>drt_accesses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>drt_accesses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>drt_accesses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>drt_accesses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>drt_accesses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +129,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>drt_access</code>.
 ```sql
 SELECT
@@ -107,6 +148,19 @@ role_arn
 FROM awscc.shield.drt_accesses
 WHERE data__Identifier = '<AccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>drt_accesses</code> in a region.
+```sql
+SELECT
+region,
+account_id
+FROM awscc.shield.drt_accesses_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -172,6 +226,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.shield.drt_accesses
+SET data__PatchDocument = string('{{ {
+    "LogBucketList": log_bucket_list,
+    "RoleArn": role_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/shield/drt_accesses_list_only/index.md b/website/docs/services/shield/drt_accesses_list_only/index.md
deleted file mode 100644
index 0b6374430..000000000
--- a/website/docs/services/shield/drt_accesses_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: drt_accesses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - drt_accesses_list_only
-  - shield
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>drt_accesses</code> in a region or regions, for all properties use <a href="/services/shield/drt_accesses/"><code>drt_accesses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>drt_accesses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Config the role and list of Amazon S3 log buckets used by the Shield Response Team (SRT) to access your AWS account while assisting with attack mitigation.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.shield.drt_accesses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "account_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>drt_accesses</code> in a region.
-```sql
-SELECT
-region,
-account_id
-FROM awscc.shield.drt_accesses_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>drt_accesses_list_only</code> resource, see <a href="/services/shield/drt_accesses/#permissions"><code>drt_accesses</code></a>
-
diff --git a/website/docs/services/shield/index.md b/website/docs/services/shield/index.md
index 085dea461..29190bad0 100644
--- a/website/docs/services/shield/index.md
+++ b/website/docs/services/shield/index.md
@@ -20,7 +20,7 @@ The shield service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The shield service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/shield/drt_accesses/">drt_accesses</a><br />
-<a href="/services/shield/drt_accesses_list_only/">drt_accesses_list_only</a><br />
-<a href="/services/shield/proactive_engagements/">proactive_engagements</a><br />
-<a href="/services/shield/proactive_engagements_list_only/">proactive_engagements_list_only</a>
+<a href="/services/shield/proactive_engagements/">proactive_engagements</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/shield/protection_groups/">protection_groups</a><br />
-<a href="/services/shield/protection_groups_list_only/">protection_groups_list_only</a><br />
-<a href="/services/shield/protections/">protections</a><br />
-<a href="/services/shield/protections_list_only/">protections_list_only</a>
+<a href="/services/shield/protections/">protections</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/shield/proactive_engagements/index.md b/website/docs/services/shield/proactive_engagements/index.md
index ed731bc2e..ad0f4b92f 100644
--- a/website/docs/services/shield/proactive_engagements/index.md
+++ b/website/docs/services/shield/proactive_engagements/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>proactive_engagement</code> resource o
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "account_id",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>proactive_engagement</code> resource o
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "account_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-shield-proactiveengagement.html"><code>AWS::Shield::ProactiveEngagement</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>proactive_engagements</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ProactiveEngagementStatus, EmergencyContactList, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>proactive_engagements</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>proactive_engagements</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>proactive_engagements_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>proactive_engagements</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>proactive_engagement</code>.
 ```sql
 SELECT
@@ -124,6 +165,19 @@ emergency_contact_list
 FROM awscc.shield.proactive_engagements
 WHERE data__Identifier = '<AccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>proactive_engagements</code> in a region.
+```sql
+SELECT
+region,
+account_id
+FROM awscc.shield.proactive_engagements_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -193,6 +247,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.shield.proactive_engagements
+SET data__PatchDocument = string('{{ {
+    "ProactiveEngagementStatus": proactive_engagement_status,
+    "EmergencyContactList": emergency_contact_list
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/shield/proactive_engagements_list_only/index.md b/website/docs/services/shield/proactive_engagements_list_only/index.md
deleted file mode 100644
index 49c6717c7..000000000
--- a/website/docs/services/shield/proactive_engagements_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: proactive_engagements_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - proactive_engagements_list_only
-  - shield
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>proactive_engagements</code> in a region or regions, for all properties use <a href="/services/shield/proactive_engagements/"><code>proactive_engagements</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>proactive_engagements_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Authorizes the Shield Response Team (SRT) to use email and phone to notify contacts about escalations to the SRT and to initiate proactive customer support.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.shield.proactive_engagements_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "account_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>proactive_engagements</code> in a region.
-```sql
-SELECT
-region,
-account_id
-FROM awscc.shield.proactive_engagements_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>proactive_engagements_list_only</code> resource, see <a href="/services/shield/proactive_engagements/#permissions"><code>proactive_engagements</code></a>
-
diff --git a/website/docs/services/shield/protection_groups/index.md b/website/docs/services/shield/protection_groups/index.md
index 8f6d1a71c..3817da7e7 100644
--- a/website/docs/services/shield/protection_groups/index.md
+++ b/website/docs/services/shield/protection_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>protection_group</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "protection_group_id",
@@ -87,6 +96,23 @@ Creates, updates, deletes or gets a <code>protection_group</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "protection_group_arn",
+    "type": "string",
+    "description": "The ARN (Amazon Resource Name) of the protection group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-shield-protectiongroup.html"><code>AWS::Shield::ProtectionGroup</code></a>.
 
@@ -96,31 +122,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>protection_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Aggregation, Pattern, ProtectionGroupId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>protection_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>protection_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>protection_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>protection_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +161,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>protection_group</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.shield.protection_groups
 WHERE data__Identifier = '<ProtectionGroupArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>protection_groups</code> in a region.
+```sql
+SELECT
+region,
+protection_group_arn
+FROM awscc.shield.protection_groups_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -230,6 +284,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.shield.protection_groups
+SET data__PatchDocument = string('{{ {
+    "Aggregation": aggregation,
+    "Pattern": pattern,
+    "Members": members,
+    "ResourceType": resource_type,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ProtectionGroupArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/shield/protection_groups_list_only/index.md b/website/docs/services/shield/protection_groups_list_only/index.md
deleted file mode 100644
index 2be154c7d..000000000
--- a/website/docs/services/shield/protection_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: protection_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - protection_groups_list_only
-  - shield
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>protection_groups</code> in a region or regions, for all properties use <a href="/services/shield/protection_groups/"><code>protection_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>protection_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A grouping of protected resources so they can be handled as a collective. This resource grouping improves the accuracy of detection and reduces false positives.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.shield.protection_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "protection_group_arn",
-    "type": "string",
-    "description": "The ARN (Amazon Resource Name) of the protection group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>protection_groups</code> in a region.
-```sql
-SELECT
-region,
-protection_group_arn
-FROM awscc.shield.protection_groups_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>protection_groups_list_only</code> resource, see <a href="/services/shield/protection_groups/#permissions"><code>protection_groups</code></a>
-
diff --git a/website/docs/services/shield/protections/index.md b/website/docs/services/shield/protections/index.md
index e69c65649..973e17982 100644
--- a/website/docs/services/shield/protections/index.md
+++ b/website/docs/services/shield/protections/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>protection</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "protection_id",
@@ -99,6 +108,23 @@ Creates, updates, deletes or gets a <code>protection</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "protection_arn",
+    "type": "string",
+    "description": "The ARN (Amazon Resource Name) of the protection."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-shield-protection.html"><code>AWS::Shield::Protection</code></a>.
 
@@ -108,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>protections</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, ResourceArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>protections</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>protections</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>protections_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>protections</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>protection</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ tags
 FROM awscc.shield.protections
 WHERE data__Identifier = '<ProtectionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>protections</code> in a region.
+```sql
+SELECT
+region,
+protection_arn
+FROM awscc.shield.protections_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -238,6 +292,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.shield.protections
+SET data__PatchDocument = string('{{ {
+    "HealthCheckArns": health_check_arns,
+    "ApplicationLayerAutomaticResponseConfiguration": application_layer_automatic_response_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ProtectionArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/shield/protections_list_only/index.md b/website/docs/services/shield/protections_list_only/index.md
deleted file mode 100644
index f44d239df..000000000
--- a/website/docs/services/shield/protections_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: protections_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - protections_list_only
-  - shield
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>protections</code> in a region or regions, for all properties use <a href="/services/shield/protections/"><code>protections</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>protections_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Enables AWS Shield Advanced for a specific AWS resource. The resource can be an Amazon CloudFront distribution, Amazon Route 53 hosted zone, AWS Global Accelerator standard accelerator, Elastic IP Address, Application Load Balancer, or a Classic Load Balancer. You can protect Amazon EC2 instances and Network Load Balancers by association with protected Amazon EC2 Elastic IP addresses.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.shield.protections_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "protection_arn",
-    "type": "string",
-    "description": "The ARN (Amazon Resource Name) of the protection."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>protections</code> in a region.
-```sql
-SELECT
-region,
-protection_arn
-FROM awscc.shield.protections_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>protections_list_only</code> resource, see <a href="/services/shield/protections/#permissions"><code>protections</code></a>
-
diff --git a/website/docs/services/signer/index.md b/website/docs/services/signer/index.md
index b5e9e125b..185e3d202 100644
--- a/website/docs/services/signer/index.md
+++ b/website/docs/services/signer/index.md
@@ -20,7 +20,7 @@ The signer service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The signer service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/signer/profile_permissions/">profile_permissions</a><br />
-<a href="/services/signer/profile_permissions_list_only/">profile_permissions_list_only</a>
+<a href="/services/signer/profile_permissions/">profile_permissions</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/signer/signing_profiles/">signing_profiles</a><br />
-<a href="/services/signer/signing_profiles_list_only/">signing_profiles_list_only</a>
+<a href="/services/signer/signing_profiles/">signing_profiles</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/signer/profile_permissions/index.md b/website/docs/services/signer/profile_permissions/index.md
index cfaf8a471..912974420 100644
--- a/website/docs/services/signer/profile_permissions/index.md
+++ b/website/docs/services/signer/profile_permissions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>profile_permission</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "profile_name",
@@ -65,6 +74,28 @@ Creates, updates, deletes or gets a <code>profile_permission</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "profile_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "statement_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-signer-profilepermission.html"><code>AWS::Signer::ProfilePermission</code></a>.
 
@@ -74,26 +105,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>profile_permissions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ProfileName, Action, Principal, StatementId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>profile_permissions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>profile_permissions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>profile_permissions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +138,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>profile_permission</code>.
 ```sql
 SELECT
@@ -114,6 +159,20 @@ statement_id
 FROM awscc.signer.profile_permissions
 WHERE region = 'us-east-1' AND data__Identifier = '<StatementId>|<ProfileName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>profile_permissions</code> in a region.
+```sql
+SELECT
+region,
+statement_id,
+profile_name
+FROM awscc.signer.profile_permissions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -196,6 +255,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/signer/profile_permissions_list_only/index.md b/website/docs/services/signer/profile_permissions_list_only/index.md
deleted file mode 100644
index db31bccd7..000000000
--- a/website/docs/services/signer/profile_permissions_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: profile_permissions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - profile_permissions_list_only
-  - signer
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>profile_permissions</code> in a region or regions, for all properties use <a href="/services/signer/profile_permissions/"><code>profile_permissions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>profile_permissions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An example resource schema demonstrating some basic constructs and validation rules.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.signer.profile_permissions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "profile_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "statement_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>profile_permissions</code> in a region.
-```sql
-SELECT
-region,
-statement_id,
-profile_name
-FROM awscc.signer.profile_permissions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>profile_permissions_list_only</code> resource, see <a href="/services/signer/profile_permissions/#permissions"><code>profile_permissions</code></a>
-
diff --git a/website/docs/services/signer/signing_profiles/index.md b/website/docs/services/signer/signing_profiles/index.md
index 50ab5cdcc..d98e14eba 100644
--- a/website/docs/services/signer/signing_profiles/index.md
+++ b/website/docs/services/signer/signing_profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>signing_profile</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "profile_name",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets a <code>signing_profile</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the specified signing profile."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-signer-signingprofile.html"><code>AWS::Signer::SigningProfile</code></a>.
 
@@ -103,31 +129,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>signing_profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PlatformId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>signing_profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>signing_profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>signing_profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>signing_profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>signing_profile</code>.
 ```sql
 SELECT
@@ -150,6 +191,19 @@ tags
 FROM awscc.signer.signing_profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>signing_profiles</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.signer.signing_profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -222,6 +276,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.signer.signing_profiles
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/signer/signing_profiles_list_only/index.md b/website/docs/services/signer/signing_profiles_list_only/index.md
deleted file mode 100644
index 694414538..000000000
--- a/website/docs/services/signer/signing_profiles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: signing_profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - signing_profiles_list_only
-  - signer
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>signing_profiles</code> in a region or regions, for all properties use <a href="/services/signer/signing_profiles/"><code>signing_profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>signing_profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A signing profile is a signing template that can be used to carry out a pre-defined signing job.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.signer.signing_profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the specified signing profile."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>signing_profiles</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.signer.signing_profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>signing_profiles_list_only</code> resource, see <a href="/services/signer/signing_profiles/#permissions"><code>signing_profiles</code></a>
-
diff --git a/website/docs/services/simspaceweaver/index.md b/website/docs/services/simspaceweaver/index.md
index b822d6917..5f153ab71 100644
--- a/website/docs/services/simspaceweaver/index.md
+++ b/website/docs/services/simspaceweaver/index.md
@@ -20,7 +20,7 @@ The simspaceweaver service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The simspaceweaver service documentation.
 <a href="/services/simspaceweaver/simulations/">simulations</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/simspaceweaver/simulations_list_only/">simulations_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/simspaceweaver/simulations/index.md b/website/docs/services/simspaceweaver/simulations/index.md
index 671de218a..ee2f01d76 100644
--- a/website/docs/services/simspaceweaver/simulations/index.md
+++ b/website/docs/services/simspaceweaver/simulations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>simulation</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>simulation</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the simulation."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-simspaceweaver-simulation.html"><code>AWS::SimSpaceWeaver::Simulation</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>simulations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>simulations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>simulations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>simulations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>simulations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>simulation</code>.
 ```sql
 SELECT
@@ -132,6 +173,19 @@ snapshot_s3_location
 FROM awscc.simspaceweaver.simulations
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>simulations</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.simspaceweaver.simulations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -212,6 +266,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/simspaceweaver/simulations_list_only/index.md b/website/docs/services/simspaceweaver/simulations_list_only/index.md
deleted file mode 100644
index 86ab1f09a..000000000
--- a/website/docs/services/simspaceweaver/simulations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: simulations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - simulations_list_only
-  - simspaceweaver
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>simulations</code> in a region or regions, for all properties use <a href="/services/simspaceweaver/simulations/"><code>simulations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>simulations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>AWS::SimSpaceWeaver::Simulation resource creates an AWS Simulation.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.simspaceweaver.simulations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the simulation."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>simulations</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.simspaceweaver.simulations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>simulations_list_only</code> resource, see <a href="/services/simspaceweaver/simulations/#permissions"><code>simulations</code></a>
-
diff --git a/website/docs/services/sns/index.md b/website/docs/services/sns/index.md
index 96f7ac149..9a768666d 100644
--- a/website/docs/services/sns/index.md
+++ b/website/docs/services/sns/index.md
@@ -20,7 +20,7 @@ The sns service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>3</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,10 +29,9 @@ The sns service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/sns/topic_inline_policies/">topic_inline_policies</a><br />
-<a href="/services/sns/topics/">topics</a>
+<a href="/services/sns/topic_inline_policies/">topic_inline_policies</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/sns/topics_list_only/">topics_list_only</a>
+<a href="/services/sns/topics/">topics</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/sns/topic_inline_policies/index.md b/website/docs/services/sns/topic_inline_policies/index.md
index 3c0c1a1aa..2f6f75cd4 100644
--- a/website/docs/services/sns/topic_inline_policies/index.md
+++ b/website/docs/services/sns/topic_inline_policies/index.md
@@ -162,6 +162,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sns.topic_inline_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyDocument": policy_document
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TopicArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sns/topics/index.md b/website/docs/services/sns/topics/index.md
index 9b89fe588..b988be3c5 100644
--- a/website/docs/services/sns/topics/index.md
+++ b/website/docs/services/sns/topics/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>topic</code> resource or lists <code>t
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "display_name",
@@ -156,6 +165,23 @@ Creates, updates, deletes or gets a <code>topic</code> resource or lists <code>t
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "topic_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-topic.html"><code>AWS::SNS::Topic</code></a>.
 
@@ -165,31 +191,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>topics</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>topics</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>topics</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>topics_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>topics</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -198,6 +230,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>topic</code>.
 ```sql
 SELECT
@@ -219,6 +260,19 @@ delivery_status_logging
 FROM awscc.sns.topics
 WHERE region = 'us-east-1' AND data__Identifier = '<TopicArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>topics</code> in a region.
+```sql
+SELECT
+region,
+topic_arn
+FROM awscc.sns.topics_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -359,6 +413,29 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sns.topics
+SET data__PatchDocument = string('{{ {
+    "DisplayName": display_name,
+    "KmsMasterKeyId": kms_master_key_id,
+    "DataProtectionPolicy": data_protection_policy,
+    "Subscription": subscription,
+    "ContentBasedDeduplication": content_based_deduplication,
+    "ArchivePolicy": archive_policy,
+    "FifoThroughputScope": fifo_throughput_scope,
+    "Tags": tags,
+    "SignatureVersion": signature_version,
+    "TracingConfig": tracing_config,
+    "DeliveryStatusLogging": delivery_status_logging
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TopicArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sns/topics_list_only/index.md b/website/docs/services/sns/topics_list_only/index.md
deleted file mode 100644
index 8b674dc24..000000000
--- a/website/docs/services/sns/topics_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: topics_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - topics_list_only
-  - sns
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>topics</code> in a region or regions, for all properties use <a href="/services/sns/topics/"><code>topics</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>topics_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::SNS::Topic&#96;&#96; resource creates a topic to which notifications can be published.<br />One account can create a maximum of 100,000 standard topics and 1,000 FIFO topics. For more information, see &#91;endpoints and quotas&#93;(https://docs.aws.amazon.com/general/latest/gr/sns.html) in the &#42;General Reference&#42;.<br />The structure of &#96;&#96;AUTHPARAMS&#96;&#96; depends on the .signature of the API request. For more information, see &#91;Examples of the complete Signature Version 4 signing process&#93;(https://docs.aws.amazon.com/general/latest/gr/sigv4-signed-request-examples.html) in the &#42;General Reference&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sns.topics_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "topic_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>topics</code> in a region.
-```sql
-SELECT
-region,
-topic_arn
-FROM awscc.sns.topics_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>topics_list_only</code> resource, see <a href="/services/sns/topics/#permissions"><code>topics</code></a>
-
diff --git a/website/docs/services/sqs/index.md b/website/docs/services/sqs/index.md
index c4425896e..7bfcccbac 100644
--- a/website/docs/services/sqs/index.md
+++ b/website/docs/services/sqs/index.md
@@ -20,7 +20,7 @@ The sqs service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>3</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,10 +29,9 @@ The sqs service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/sqs/queue_inline_policies/">queue_inline_policies</a><br />
-<a href="/services/sqs/queues/">queues</a>
+<a href="/services/sqs/queue_inline_policies/">queue_inline_policies</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/sqs/queues_list_only/">queues_list_only</a>
+<a href="/services/sqs/queues/">queues</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/sqs/queue_inline_policies/index.md b/website/docs/services/sqs/queue_inline_policies/index.md
index 8a01f8c91..766433462 100644
--- a/website/docs/services/sqs/queue_inline_policies/index.md
+++ b/website/docs/services/sqs/queue_inline_policies/index.md
@@ -162,6 +162,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sqs.queue_inline_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyDocument": policy_document
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Queue>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sqs/queues/index.md b/website/docs/services/sqs/queues/index.md
index 71f7fba73..080f939ea 100644
--- a/website/docs/services/sqs/queues/index.md
+++ b/website/docs/services/sqs/queues/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>queue</code> resource or lists <code>q
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "queue_url",
@@ -142,6 +151,23 @@ Creates, updates, deletes or gets a <code>queue</code> resource or lists <code>q
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "queue_url",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sqs-queue.html"><code>AWS::SQS::Queue</code></a>.
 
@@ -151,31 +177,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>queues_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>queues</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -184,6 +216,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>queue</code>.
 ```sql
 SELECT
@@ -209,6 +250,19 @@ visibility_timeout
 FROM awscc.sqs.queues
 WHERE region = 'us-east-1' AND data__Identifier = '<QueueUrl>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>queues</code> in a region.
+```sql
+SELECT
+region,
+queue_url
+FROM awscc.sqs.queues_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -361,6 +415,32 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sqs.queues
+SET data__PatchDocument = string('{{ {
+    "ContentBasedDeduplication": content_based_deduplication,
+    "DeduplicationScope": deduplication_scope,
+    "DelaySeconds": delay_seconds,
+    "FifoThroughputLimit": fifo_throughput_limit,
+    "KmsDataKeyReusePeriodSeconds": kms_data_key_reuse_period_seconds,
+    "KmsMasterKeyId": kms_master_key_id,
+    "SqsManagedSseEnabled": sqs_managed_sse_enabled,
+    "MaximumMessageSize": maximum_message_size,
+    "MessageRetentionPeriod": message_retention_period,
+    "ReceiveMessageWaitTimeSeconds": receive_message_wait_time_seconds,
+    "RedriveAllowPolicy": redrive_allow_policy,
+    "RedrivePolicy": redrive_policy,
+    "Tags": tags,
+    "VisibilityTimeout": visibility_timeout
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<QueueUrl>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sqs/queues_list_only/index.md b/website/docs/services/sqs/queues_list_only/index.md
deleted file mode 100644
index 61bee2a87..000000000
--- a/website/docs/services/sqs/queues_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: queues_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - queues_list_only
-  - sqs
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>queues</code> in a region or regions, for all properties use <a href="/services/sqs/queues/"><code>queues</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>queues_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::SQS::Queue&#96;&#96; resource creates an SQS standard or FIFO queue.<br />Keep the following caveats in mind:<br />+ If you don't specify the &#96;&#96;FifoQueue&#96;&#96; property, SQS creates a standard queue.<br />You can't change the queue type after you create it and you can't convert an existing standard queue into a FIFO queue. You must either create a new FIFO queue for your application or delete your existing standard queue and recreate it as a FIFO queue. For more information, see &#91;Moving from a standard queue to a FIFO queue&#93;(https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/FIFO-queues-moving.html) in the &#42;Developer Guide&#42;. <br />+ If you don't provide a value for a property, the queue is created with the default value for the property.<br />+ If you delete a queue, you must wait at least 60 seconds before creating a queue with the same name.<br />+ To successfully create a new queue, you must provide a queue name that adheres to the &#91;limits related to queues&#93;(https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/limits-queues.html) and is unique within the scope of your queues.<br /><br />For more information about creating FIFO (first-in-first-out) queues, see &#91;Creating an queue ()&#93;(https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/create-queue-cloudformation.html) in the &#42;Developer Guide&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sqs.queues_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "queue_url",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>queues</code> in a region.
-```sql
-SELECT
-region,
-queue_url
-FROM awscc.sqs.queues_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>queues_list_only</code> resource, see <a href="/services/sqs/queues/#permissions"><code>queues</code></a>
-
diff --git a/website/docs/services/ssm/associations/index.md b/website/docs/services/ssm/associations/index.md
index 9e7362ac4..aef8634f4 100644
--- a/website/docs/services/ssm/associations/index.md
+++ b/website/docs/services/ssm/associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>association</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "association_name",
@@ -166,6 +175,23 @@ Creates, updates, deletes or gets an <code>association</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "association_id",
+    "type": "string",
+    "description": "Unique identifier of the association."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html"><code>AWS::SSM::Association</code></a>.
 
@@ -175,31 +201,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -208,6 +240,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>association</code>.
 ```sql
 SELECT
@@ -233,6 +274,19 @@ automation_target_parameter_name
 FROM awscc.ssm.associations
 WHERE region = 'us-east-1' AND data__Identifier = '<AssociationId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>associations</code> in a region.
+```sql
+SELECT
+region,
+association_id
+FROM awscc.ssm.associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -365,6 +419,35 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ssm.associations
+SET data__PatchDocument = string('{{ {
+    "AssociationName": association_name,
+    "CalendarNames": calendar_names,
+    "ScheduleExpression": schedule_expression,
+    "MaxErrors": max_errors,
+    "Parameters": parameters,
+    "InstanceId": instance_id,
+    "WaitForSuccessTimeoutSeconds": wait_for_success_timeout_seconds,
+    "MaxConcurrency": max_concurrency,
+    "ComplianceSeverity": compliance_severity,
+    "Targets": targets,
+    "SyncCompliance": sync_compliance,
+    "OutputLocation": output_location,
+    "ScheduleOffset": schedule_offset,
+    "Name": name,
+    "ApplyOnlyAtCronInterval": apply_only_at_cron_interval,
+    "DocumentVersion": document_version,
+    "AutomationTargetParameterName": automation_target_parameter_name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AssociationId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ssm/associations_list_only/index.md b/website/docs/services/ssm/associations_list_only/index.md
deleted file mode 100644
index 65d0f5fa0..000000000
--- a/website/docs/services/ssm/associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - associations_list_only
-  - ssm
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>associations</code> in a region or regions, for all properties use <a href="/services/ssm/associations/"><code>associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::SSM::Association resource associates an SSM document in AWS Systems Manager with EC2 instances that contain a configuration agent to process the document.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ssm.associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "association_id",
-    "type": "string",
-    "description": "Unique identifier of the association."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>associations</code> in a region.
-```sql
-SELECT
-region,
-association_id
-FROM awscc.ssm.associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>associations_list_only</code> resource, see <a href="/services/ssm/associations/#permissions"><code>associations</code></a>
-
diff --git a/website/docs/services/ssm/documents/index.md b/website/docs/services/ssm/documents/index.md
index d4bd070bc..c5513ad5f 100644
--- a/website/docs/services/ssm/documents/index.md
+++ b/website/docs/services/ssm/documents/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>document</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "content",
@@ -131,6 +140,23 @@ Creates, updates, deletes or gets a <code>document</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "A name for the Systems Manager document."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-document.html"><code>AWS::SSM::Document</code></a>.
 
@@ -140,31 +166,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>documents</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Content, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>documents</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>documents</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>documents_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>documents</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -173,6 +205,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>document</code>.
 ```sql
 SELECT
@@ -190,6 +231,19 @@ update_method
 FROM awscc.ssm.documents
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>documents</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.ssm.documents_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -294,6 +348,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ssm.documents
+SET data__PatchDocument = string('{{ {
+    "Content": content,
+    "Attachments": attachments,
+    "VersionName": version_name,
+    "DocumentFormat": document_format,
+    "TargetType": target_type,
+    "Tags": tags,
+    "Requires": requires,
+    "UpdateMethod": update_method
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ssm/documents_list_only/index.md b/website/docs/services/ssm/documents_list_only/index.md
deleted file mode 100644
index 69b0785fc..000000000
--- a/website/docs/services/ssm/documents_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: documents_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - documents_list_only
-  - ssm
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>documents</code> in a region or regions, for all properties use <a href="/services/ssm/documents/"><code>documents</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>documents_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::SSM::Document resource is an SSM document in AWS Systems Manager that defines the actions that Systems Manager performs, which can be used to set up and run commands on your instances.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ssm.documents_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "A name for the Systems Manager document."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>documents</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.ssm.documents_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>documents_list_only</code> resource, see <a href="/services/ssm/documents/#permissions"><code>documents</code></a>
-
diff --git a/website/docs/services/ssm/index.md b/website/docs/services/ssm/index.md
index 3481c7bea..4c61ebbbd 100644
--- a/website/docs/services/ssm/index.md
+++ b/website/docs/services/ssm/index.md
@@ -20,7 +20,7 @@ The ssm service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>14</b></span><br />
+<span>total resources:&nbsp;<b>8</b></span><br />
 </div>
 </div>
 
@@ -30,20 +30,14 @@ The ssm service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/ssm/associations/">associations</a><br />
-<a href="/services/ssm/associations_list_only/">associations_list_only</a><br />
 <a href="/services/ssm/documents/">documents</a><br />
-<a href="/services/ssm/documents_list_only/">documents_list_only</a><br />
 <a href="/services/ssm/maintenance_window_targets/">maintenance_window_targets</a><br />
-<a href="/services/ssm/maintenance_window_tasks/">maintenance_window_tasks</a><br />
-<a href="/services/ssm/parameters/">parameters</a>
+<a href="/services/ssm/maintenance_window_tasks/">maintenance_window_tasks</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/ssm/parameters_list_only/">parameters_list_only</a><br />
+<a href="/services/ssm/parameters/">parameters</a><br />
 <a href="/services/ssm/patch_baselines/">patch_baselines</a><br />
-<a href="/services/ssm/patch_baselines_list_only/">patch_baselines_list_only</a><br />
 <a href="/services/ssm/resource_data_syncs/">resource_data_syncs</a><br />
-<a href="/services/ssm/resource_data_syncs_list_only/">resource_data_syncs_list_only</a><br />
-<a href="/services/ssm/resource_policies/">resource_policies</a><br />
-<a href="/services/ssm/resource_policies_list_only/">resource_policies_list_only</a>
+<a href="/services/ssm/resource_policies/">resource_policies</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/ssm/maintenance_window_targets/index.md b/website/docs/services/ssm/maintenance_window_targets/index.md
index f8ea402ee..8c7851b2e 100644
--- a/website/docs/services/ssm/maintenance_window_targets/index.md
+++ b/website/docs/services/ssm/maintenance_window_targets/index.md
@@ -107,3 +107,4 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 
 
+
diff --git a/website/docs/services/ssm/maintenance_window_tasks/index.md b/website/docs/services/ssm/maintenance_window_tasks/index.md
index 584a60ef1..2fdeab7d3 100644
--- a/website/docs/services/ssm/maintenance_window_tasks/index.md
+++ b/website/docs/services/ssm/maintenance_window_tasks/index.md
@@ -313,3 +313,4 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 
 
+
diff --git a/website/docs/services/ssm/parameters/index.md b/website/docs/services/ssm/parameters/index.md
index fc3796674..057c1c72f 100644
--- a/website/docs/services/ssm/parameters/index.md
+++ b/website/docs/services/ssm/parameters/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>parameter</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "type",
@@ -85,6 +94,23 @@ Creates, updates, deletes or gets a <code>parameter</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the parameter.<br />The reported maximum length of 2048 characters for a parameter name includes 1037 characters that are reserved for internal use by SYS. The maximum length for a parameter name that you specify is 1011 characters.<br />This count of 1011 characters includes the characters in the ARN that precede the name you specify. This ARN length will vary depending on your partition and Region. For example, the following 45 characters count toward the 1011 character maximum for a parameter created in the US East (Ohio) Region: &#96;&#96;arn:aws:ssm:us-east-2:111122223333:parameter/&#96;&#96;."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html"><code>AWS::SSM::Parameter</code></a>.
 
@@ -94,31 +120,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>parameters</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Value, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>parameters</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>parameters</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>parameters_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>parameters</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -127,6 +159,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>parameter</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ name
 FROM awscc.ssm.parameters
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>parameters</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.ssm.parameters_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -237,6 +291,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ssm.parameters
+SET data__PatchDocument = string('{{ {
+    "Type": type,
+    "Value": value,
+    "Description": description,
+    "Policies": policies,
+    "AllowedPattern": allowed_pattern,
+    "Tier": tier,
+    "Tags": tags,
+    "DataType": data_type
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ssm/parameters_list_only/index.md b/website/docs/services/ssm/parameters_list_only/index.md
deleted file mode 100644
index bed6437ad..000000000
--- a/website/docs/services/ssm/parameters_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: parameters_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - parameters_list_only
-  - ssm
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>parameters</code> in a region or regions, for all properties use <a href="/services/ssm/parameters/"><code>parameters</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>parameters_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The &#96;&#96;AWS::SSM::Parameter&#96;&#96; resource creates an SSM parameter in SYSlong Parameter Store.<br />To create an SSM parameter, you must have the IAMlong (IAM) permissions &#96;&#96;ssm:PutParameter&#96;&#96; and &#96;&#96;ssm:AddTagsToResource&#96;&#96;. On stack creation, CFNlong adds the following three tags to the parameter: &#96;&#96;aws:cloudformation:stack-name&#96;&#96;, &#96;&#96;aws:cloudformation:logical-id&#96;&#96;, and &#96;&#96;aws:cloudformation:stack-id&#96;&#96;, in addition to any custom tags you specify.<br />To add, update, or remove tags during stack update, you must have IAM permissions for both &#96;&#96;ssm:AddTagsToResource&#96;&#96; and &#96;&#96;ssm:RemoveTagsFromResource&#96;&#96;. For more information, see &#91;Managing access using policies&#93;(https://docs.aws.amazon.com/systems-manager/latest/userguide/security-iam.html#security&#95;iam&#95;access-manage) in the &#42;User Guide&#42;.<br />For information about valid values for parameters, see &#91;About requirements and constraints for parameter names&#93;(https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-paramstore-su-create.html#sysman-parameter-name-constraints) in the &#42;User Guide&#42; and &#91;PutParameter&#93;(https://docs.aws.amazon.com/systems-manager/latest/APIReference/API&#95;PutParameter.html) in the &#42;API Reference&#42;.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ssm.parameters_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The name of the parameter.<br />The reported maximum length of 2048 characters for a parameter name includes 1037 characters that are reserved for internal use by SYS. The maximum length for a parameter name that you specify is 1011 characters.<br />This count of 1011 characters includes the characters in the ARN that precede the name you specify. This ARN length will vary depending on your partition and Region. For example, the following 45 characters count toward the 1011 character maximum for a parameter created in the US East (Ohio) Region: &#96;&#96;arn:aws:ssm:us-east-2:111122223333:parameter/&#96;&#96;."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>parameters</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.ssm.parameters_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>parameters_list_only</code> resource, see <a href="/services/ssm/parameters/#permissions"><code>parameters</code></a>
-
diff --git a/website/docs/services/ssm/patch_baselines/index.md b/website/docs/services/ssm/patch_baselines/index.md
index cba69128d..15858ce9f 100644
--- a/website/docs/services/ssm/patch_baselines/index.md
+++ b/website/docs/services/ssm/patch_baselines/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>patch_baseline</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -209,6 +218,23 @@ Creates, updates, deletes or gets a <code>patch_baseline</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The ID of the patch baseline."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html"><code>AWS::SSM::PatchBaseline</code></a>.
 
@@ -218,31 +244,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>patch_baselines</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>patch_baselines</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>patch_baselines</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>patch_baselines_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>patch_baselines</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -251,6 +283,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>patch_baseline</code>.
 ```sql
 SELECT
@@ -274,6 +315,19 @@ tags
 FROM awscc.ssm.patch_baselines
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>patch_baselines</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.ssm.patch_baselines_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -409,6 +463,32 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ssm.patch_baselines
+SET data__PatchDocument = string('{{ {
+    "DefaultBaseline": default_baseline,
+    "Description": description,
+    "ApprovalRules": approval_rules,
+    "Sources": sources,
+    "Name": name,
+    "RejectedPatches": rejected_patches,
+    "ApprovedPatches": approved_patches,
+    "RejectedPatchesAction": rejected_patches_action,
+    "PatchGroups": patch_groups,
+    "ApprovedPatchesComplianceLevel": approved_patches_compliance_level,
+    "ApprovedPatchesEnableNonSecurity": approved_patches_enable_non_security,
+    "GlobalFilters": global_filters,
+    "AvailableSecurityUpdatesComplianceStatus": available_security_updates_compliance_status,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ssm/patch_baselines_list_only/index.md b/website/docs/services/ssm/patch_baselines_list_only/index.md
deleted file mode 100644
index 6859fb8e7..000000000
--- a/website/docs/services/ssm/patch_baselines_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: patch_baselines_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - patch_baselines_list_only
-  - ssm
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>patch_baselines</code> in a region or regions, for all properties use <a href="/services/ssm/patch_baselines/"><code>patch_baselines</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>patch_baselines_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SSM::PatchBaseline</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ssm.patch_baselines_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The ID of the patch baseline."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>patch_baselines</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.ssm.patch_baselines_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>patch_baselines_list_only</code> resource, see <a href="/services/ssm/patch_baselines/#permissions"><code>patch_baselines</code></a>
-
diff --git a/website/docs/services/ssm/resource_data_syncs/index.md b/website/docs/services/ssm/resource_data_syncs/index.md
index 67327dd48..6e2c93eac 100644
--- a/website/docs/services/ssm/resource_data_syncs/index.md
+++ b/website/docs/services/ssm/resource_data_syncs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_data_sync</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "s3_destination",
@@ -146,6 +155,23 @@ Creates, updates, deletes or gets a <code>resource_data_sync</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "sync_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-resourcedatasync.html"><code>AWS::SSM::ResourceDataSync</code></a>.
 
@@ -155,31 +181,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_data_syncs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SyncName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_data_syncs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_data_syncs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_data_syncs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_data_syncs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -188,6 +220,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_data_sync</code>.
 ```sql
 SELECT
@@ -204,6 +245,19 @@ bucket_prefix
 FROM awscc.ssm.resource_data_syncs
 WHERE region = 'us-east-1' AND data__Identifier = '<SyncName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_data_syncs</code> in a region.
+```sql
+SELECT
+region,
+sync_name
+FROM awscc.ssm.resource_data_syncs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -309,6 +363,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ssm.resource_data_syncs
+SET data__PatchDocument = string('{{ {
+    "SyncSource": sync_source
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SyncName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ssm/resource_data_syncs_list_only/index.md b/website/docs/services/ssm/resource_data_syncs_list_only/index.md
deleted file mode 100644
index d13424cea..000000000
--- a/website/docs/services/ssm/resource_data_syncs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_data_syncs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_data_syncs_list_only
-  - ssm
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_data_syncs</code> in a region or regions, for all properties use <a href="/services/ssm/resource_data_syncs/"><code>resource_data_syncs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_data_syncs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SSM::ResourceDataSync</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ssm.resource_data_syncs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "sync_name",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_data_syncs</code> in a region.
-```sql
-SELECT
-region,
-sync_name
-FROM awscc.ssm.resource_data_syncs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_data_syncs_list_only</code> resource, see <a href="/services/ssm/resource_data_syncs/#permissions"><code>resource_data_syncs</code></a>
-
diff --git a/website/docs/services/ssm/resource_policies/index.md b/website/docs/services/ssm/resource_policies/index.md
index 92e57f344..8b0cf0edb 100644
--- a/website/docs/services/ssm/resource_policies/index.md
+++ b/website/docs/services/ssm/resource_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_policy</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "resource_arn",
@@ -60,6 +69,33 @@ Creates, updates, deletes or gets a <code>resource_policy</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "resource_arn",
+    "type": "string",
+    "description": "Arn of OpsItemGroup etc."
+  },
+  {
+    "name": "policy",
+    "type": "object",
+    "description": "Actual policy statement."
+  },
+  {
+    "name": "policy_id",
+    "type": "string",
+    "description": "An unique identifier within the policies of a resource."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-resourcepolicy.html"><code>AWS::SSM::ResourcePolicy</code></a>.
 
@@ -69,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResourceArn, Policy, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_policy</code>.
 ```sql
 SELECT
@@ -113,6 +164,20 @@ policy_hash
 FROM awscc.ssm.resource_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<PolicyId>|<ResourceArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_policies</code> in a region.
+```sql
+SELECT
+region,
+policy_id,
+resource_arn
+FROM awscc.ssm.resource_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -179,6 +244,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ssm.resource_policies
+SET data__PatchDocument = string('{{ {
+    "Policy": policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PolicyId>|<ResourceArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ssm/resource_policies_list_only/index.md b/website/docs/services/ssm/resource_policies_list_only/index.md
deleted file mode 100644
index 4206cbbb3..000000000
--- a/website/docs/services/ssm/resource_policies_list_only/index.md
+++ /dev/null
@@ -1,91 +0,0 @@
----
-title: resource_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_policies_list_only
-  - ssm
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_policies</code> in a region or regions, for all properties use <a href="/services/ssm/resource_policies/"><code>resource_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SSM::ResourcePolicy</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ssm.resource_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "resource_arn",
-    "type": "string",
-    "description": "Arn of OpsItemGroup etc."
-  },
-  {
-    "name": "policy",
-    "type": "object",
-    "description": "Actual policy statement."
-  },
-  {
-    "name": "policy_id",
-    "type": "string",
-    "description": "An unique identifier within the policies of a resource."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_policies</code> in a region.
-```sql
-SELECT
-region,
-policy_id,
-resource_arn
-FROM awscc.ssm.resource_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_policies_list_only</code> resource, see <a href="/services/ssm/resource_policies/#permissions"><code>resource_policies</code></a>
-
diff --git a/website/docs/services/ssmcontacts/contact_channels/index.md b/website/docs/services/ssmcontacts/contact_channels/index.md
index 4fd187609..83e03bcd2 100644
--- a/website/docs/services/ssmcontacts/contact_channels/index.md
+++ b/website/docs/services/ssmcontacts/contact_channels/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>contact_channel</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "contact_id",
@@ -70,6 +79,23 @@ Creates, updates, deletes or gets a <code>contact_channel</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the engagement to a contact channel."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmcontacts-contactchannel.html"><code>AWS::SSMContacts::ContactChannel</code></a>.
 
@@ -79,31 +105,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>contact_channels</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>contact_channels</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>contact_channels</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>contact_channels_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>contact_channels</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -112,6 +144,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>contact_channel</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ arn
 FROM awscc.ssmcontacts.contact_channels
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>contact_channels</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ssmcontacts.contact_channels_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -209,6 +263,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ssmcontacts.contact_channels
+SET data__PatchDocument = string('{{ {
+    "ChannelName": channel_name,
+    "DeferActivation": defer_activation,
+    "ChannelAddress": channel_address
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ssmcontacts/contact_channels_list_only/index.md b/website/docs/services/ssmcontacts/contact_channels_list_only/index.md
deleted file mode 100644
index b669d4ca0..000000000
--- a/website/docs/services/ssmcontacts/contact_channels_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: contact_channels_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - contact_channels_list_only
-  - ssmcontacts
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>contact_channels</code> in a region or regions, for all properties use <a href="/services/ssmcontacts/contact_channels/"><code>contact_channels</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>contact_channels_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SSMContacts::ContactChannel</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ssmcontacts.contact_channels_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the engagement to a contact channel."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>contact_channels</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ssmcontacts.contact_channels_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>contact_channels_list_only</code> resource, see <a href="/services/ssmcontacts/contact_channels/#permissions"><code>contact_channels</code></a>
-
diff --git a/website/docs/services/ssmcontacts/contacts/index.md b/website/docs/services/ssmcontacts/contacts/index.md
index 75d5f0ed4..3883b5398 100644
--- a/website/docs/services/ssmcontacts/contacts/index.md
+++ b/website/docs/services/ssmcontacts/contacts/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>contact</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "alias",
@@ -130,6 +139,23 @@ Creates, updates, deletes or gets a <code>contact</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the contact."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmcontacts-contact.html"><code>AWS::SSMContacts::Contact</code></a>.
 
@@ -139,31 +165,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>contacts</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Alias, DisplayName, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>contacts</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>contacts</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>contacts_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>contacts</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -172,6 +204,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>contact</code>.
 ```sql
 SELECT
@@ -185,6 +226,19 @@ arn
 FROM awscc.ssmcontacts.contacts
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>contacts</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ssmcontacts.contacts_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -275,6 +329,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ssmcontacts.contacts
+SET data__PatchDocument = string('{{ {
+    "DisplayName": display_name,
+    "Plan": plan,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ssmcontacts/contacts_list_only/index.md b/website/docs/services/ssmcontacts/contacts_list_only/index.md
deleted file mode 100644
index 536d3c778..000000000
--- a/website/docs/services/ssmcontacts/contacts_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: contacts_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - contacts_list_only
-  - ssmcontacts
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>contacts</code> in a region or regions, for all properties use <a href="/services/ssmcontacts/contacts/"><code>contacts</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>contacts_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SSMContacts::Contact</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ssmcontacts.contacts_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the contact."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>contacts</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ssmcontacts.contacts_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>contacts_list_only</code> resource, see <a href="/services/ssmcontacts/contacts/#permissions"><code>contacts</code></a>
-
diff --git a/website/docs/services/ssmcontacts/index.md b/website/docs/services/ssmcontacts/index.md
index 1e88a1e85..76dad123b 100644
--- a/website/docs/services/ssmcontacts/index.md
+++ b/website/docs/services/ssmcontacts/index.md
@@ -20,7 +20,7 @@ The ssmcontacts service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>7</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,13 +30,10 @@ The ssmcontacts service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/ssmcontacts/contact_channels/">contact_channels</a><br />
-<a href="/services/ssmcontacts/contact_channels_list_only/">contact_channels_list_only</a><br />
-<a href="/services/ssmcontacts/contacts/">contacts</a><br />
-<a href="/services/ssmcontacts/contacts_list_only/">contacts_list_only</a>
+<a href="/services/ssmcontacts/contacts/">contacts</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/ssmcontacts/plans/">plans</a><br />
-<a href="/services/ssmcontacts/rotations/">rotations</a><br />
-<a href="/services/ssmcontacts/rotations_list_only/">rotations_list_only</a>
+<a href="/services/ssmcontacts/rotations/">rotations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/ssmcontacts/plans/index.md b/website/docs/services/ssmcontacts/plans/index.md
index a731cb977..722a780ef 100644
--- a/website/docs/services/ssmcontacts/plans/index.md
+++ b/website/docs/services/ssmcontacts/plans/index.md
@@ -237,6 +237,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ssmcontacts.plans
+SET data__PatchDocument = string('{{ {
+    "Stages": stages,
+    "RotationIds": rotation_ids
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ssmcontacts/rotations/index.md b/website/docs/services/ssmcontacts/rotations/index.md
index 6f74b97b2..15d828287 100644
--- a/website/docs/services/ssmcontacts/rotations/index.md
+++ b/website/docs/services/ssmcontacts/rotations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>rotation</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -155,6 +164,23 @@ Creates, updates, deletes or gets a <code>rotation</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the rotation."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmcontacts-rotation.html"><code>AWS::SSMContacts::Rotation</code></a>.
 
@@ -164,31 +190,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>rotations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, ContactIds, StartTime, TimeZoneId, Recurrence, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>rotations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>rotations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>rotations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>rotations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -197,6 +229,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>rotation</code>.
 ```sql
 SELECT
@@ -211,6 +252,19 @@ arn
 FROM awscc.ssmcontacts.rotations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>rotations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ssmcontacts.rotations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -317,6 +371,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ssmcontacts.rotations
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "ContactIds": contact_ids,
+    "StartTime": start_time,
+    "TimeZoneId": time_zone_id,
+    "Recurrence": recurrence,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ssmcontacts/rotations_list_only/index.md b/website/docs/services/ssmcontacts/rotations_list_only/index.md
deleted file mode 100644
index 311754c2a..000000000
--- a/website/docs/services/ssmcontacts/rotations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: rotations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - rotations_list_only
-  - ssmcontacts
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>rotations</code> in a region or regions, for all properties use <a href="/services/ssmcontacts/rotations/"><code>rotations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>rotations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SSMContacts::Rotation.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ssmcontacts.rotations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the rotation."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>rotations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ssmcontacts.rotations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>rotations_list_only</code> resource, see <a href="/services/ssmcontacts/rotations/#permissions"><code>rotations</code></a>
-
diff --git a/website/docs/services/ssmguiconnect/index.md b/website/docs/services/ssmguiconnect/index.md
index f66c5dcf1..f6171d364 100644
--- a/website/docs/services/ssmguiconnect/index.md
+++ b/website/docs/services/ssmguiconnect/index.md
@@ -20,7 +20,7 @@ The ssmguiconnect service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The ssmguiconnect service documentation.
 <a href="/services/ssmguiconnect/preferences/">preferences</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/ssmguiconnect/preferences_list_only/">preferences_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/ssmguiconnect/preferences/index.md b/website/docs/services/ssmguiconnect/preferences/index.md
index db3255d60..142357000 100644
--- a/website/docs/services/ssmguiconnect/preferences/index.md
+++ b/website/docs/services/ssmguiconnect/preferences/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>preference</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "account_id",
@@ -81,6 +90,23 @@ Creates, updates, deletes or gets a <code>preference</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "account_id",
+    "type": "string",
+    "description": "The AWS Account Id that the preference is associated with, used as the unique identifier for this resource."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmguiconnect-preference.html"><code>AWS::SSMGuiConnect::Preferences</code></a>.
 
@@ -90,31 +116,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>preferences</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>preferences</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>preferences</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>preferences_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>preferences</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -123,6 +155,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>preference</code>.
 ```sql
 SELECT
@@ -132,6 +173,19 @@ connection_recording_preferences
 FROM awscc.ssmguiconnect.preferences
 WHERE region = 'us-east-1' AND data__Identifier = '<AccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>preferences</code> in a region.
+```sql
+SELECT
+region,
+account_id
+FROM awscc.ssmguiconnect.preferences_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -197,6 +251,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ssmguiconnect.preferences
+SET data__PatchDocument = string('{{ {
+    "ConnectionRecordingPreferences": connection_recording_preferences
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ssmguiconnect/preferences_list_only/index.md b/website/docs/services/ssmguiconnect/preferences_list_only/index.md
deleted file mode 100644
index c4fe1408f..000000000
--- a/website/docs/services/ssmguiconnect/preferences_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: preferences_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - preferences_list_only
-  - ssmguiconnect
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>preferences</code> in a region or regions, for all properties use <a href="/services/ssmguiconnect/preferences/"><code>preferences</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>preferences_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::SSMGuiConnect::Preferences Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ssmguiconnect.preferences_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "account_id",
-    "type": "string",
-    "description": "The AWS Account Id that the preference is associated with, used as the unique identifier for this resource."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>preferences</code> in a region.
-```sql
-SELECT
-region,
-account_id
-FROM awscc.ssmguiconnect.preferences_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>preferences_list_only</code> resource, see <a href="/services/ssmguiconnect/preferences/#permissions"><code>preferences</code></a>
-
diff --git a/website/docs/services/ssmincidents/index.md b/website/docs/services/ssmincidents/index.md
index 369ca4c42..c8618c658 100644
--- a/website/docs/services/ssmincidents/index.md
+++ b/website/docs/services/ssmincidents/index.md
@@ -20,7 +20,7 @@ The ssmincidents service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The ssmincidents service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/ssmincidents/replication_sets/">replication_sets</a><br />
-<a href="/services/ssmincidents/replication_sets_list_only/">replication_sets_list_only</a>
+<a href="/services/ssmincidents/replication_sets/">replication_sets</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/ssmincidents/response_plans/">response_plans</a><br />
-<a href="/services/ssmincidents/response_plans_list_only/">response_plans_list_only</a>
+<a href="/services/ssmincidents/response_plans/">response_plans</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/ssmincidents/replication_sets/index.md b/website/docs/services/ssmincidents/replication_sets/index.md
index 11ca74201..71d3c751e 100644
--- a/website/docs/services/ssmincidents/replication_sets/index.md
+++ b/website/docs/services/ssmincidents/replication_sets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>replication_set</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -91,6 +100,23 @@ Creates, updates, deletes or gets a <code>replication_set</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The ARN of the ReplicationSet."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmincidents-replicationset.html"><code>AWS::SSMIncidents::ReplicationSet</code></a>.
 
@@ -100,31 +126,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>replication_sets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Regions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>replication_sets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>replication_sets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>replication_sets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>replication_sets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -133,6 +165,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>replication_set</code>.
 ```sql
 SELECT
@@ -144,6 +185,19 @@ tags
 FROM awscc.ssmincidents.replication_sets
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>replication_sets</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ssmincidents.replication_sets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +271,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ssmincidents.replication_sets
+SET data__PatchDocument = string('{{ {
+    "Regions": regions,
+    "DeletionProtected": deletion_protected,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ssmincidents/replication_sets_list_only/index.md b/website/docs/services/ssmincidents/replication_sets_list_only/index.md
deleted file mode 100644
index 904e749ce..000000000
--- a/website/docs/services/ssmincidents/replication_sets_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: replication_sets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - replication_sets_list_only
-  - ssmincidents
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>replication_sets</code> in a region or regions, for all properties use <a href="/services/ssmincidents/replication_sets/"><code>replication_sets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>replication_sets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::SSMIncidents::ReplicationSet</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ssmincidents.replication_sets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The ARN of the ReplicationSet."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>replication_sets</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ssmincidents.replication_sets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>replication_sets_list_only</code> resource, see <a href="/services/ssmincidents/replication_sets/#permissions"><code>replication_sets</code></a>
-
diff --git a/website/docs/services/ssmincidents/response_plans/index.md b/website/docs/services/ssmincidents/response_plans/index.md
index 6a78dd795..09110dcf4 100644
--- a/website/docs/services/ssmincidents/response_plans/index.md
+++ b/website/docs/services/ssmincidents/response_plans/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>response_plan</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -237,6 +246,23 @@ Creates, updates, deletes or gets a <code>response_plan</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The ARN of the response plan."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmincidents-responseplan.html"><code>AWS::SSMIncidents::ResponsePlan</code></a>.
 
@@ -246,31 +272,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>response_plans</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, IncidentTemplate, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>response_plans</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>response_plans</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>response_plans_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>response_plans</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -279,6 +311,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>response_plan</code>.
 ```sql
 SELECT
@@ -295,6 +336,19 @@ incident_template
 FROM awscc.ssmincidents.response_plans
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>response_plans</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.ssmincidents.response_plans_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -416,6 +470,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ssmincidents.response_plans
+SET data__PatchDocument = string('{{ {
+    "DisplayName": display_name,
+    "ChatChannel": chat_channel,
+    "Engagements": engagements,
+    "Actions": actions,
+    "Integrations": integrations,
+    "Tags": tags,
+    "IncidentTemplate": incident_template
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ssmincidents/response_plans_list_only/index.md b/website/docs/services/ssmincidents/response_plans_list_only/index.md
deleted file mode 100644
index ba86f3cc0..000000000
--- a/website/docs/services/ssmincidents/response_plans_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: response_plans_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - response_plans_list_only
-  - ssmincidents
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>response_plans</code> in a region or regions, for all properties use <a href="/services/ssmincidents/response_plans/"><code>response_plans</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>response_plans_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::SSMIncidents::ResponsePlan</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ssmincidents.response_plans_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The ARN of the response plan."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>response_plans</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.ssmincidents.response_plans_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>response_plans_list_only</code> resource, see <a href="/services/ssmincidents/response_plans/#permissions"><code>response_plans</code></a>
-
diff --git a/website/docs/services/ssmquicksetup/configuration_managers/index.md b/website/docs/services/ssmquicksetup/configuration_managers/index.md
index f23c068f0..f59e5d30c 100644
--- a/website/docs/services/ssmquicksetup/configuration_managers/index.md
+++ b/website/docs/services/ssmquicksetup/configuration_managers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>configuration_manager</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "configuration_definitions",
@@ -139,6 +148,23 @@ Creates, updates, deletes or gets a <code>configuration_manager</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "manager_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmquicksetup-configurationmanager.html"><code>AWS::SSMQuickSetup::ConfigurationManager</code></a>.
 
@@ -148,31 +174,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>configuration_managers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ConfigurationDefinitions, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>configuration_managers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>configuration_managers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>configuration_managers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>configuration_managers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -181,6 +213,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>configuration_manager</code>.
 ```sql
 SELECT
@@ -196,6 +237,19 @@ tags
 FROM awscc.ssmquicksetup.configuration_managers
 WHERE region = 'us-east-1' AND data__Identifier = '<ManagerArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>configuration_managers</code> in a region.
+```sql
+SELECT
+region,
+manager_arn
+FROM awscc.ssmquicksetup.configuration_managers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -274,6 +328,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.ssmquicksetup.configuration_managers
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Name": name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ManagerArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/ssmquicksetup/configuration_managers_list_only/index.md b/website/docs/services/ssmquicksetup/configuration_managers_list_only/index.md
deleted file mode 100644
index 4c6b766d2..000000000
--- a/website/docs/services/ssmquicksetup/configuration_managers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: configuration_managers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - configuration_managers_list_only
-  - ssmquicksetup
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>configuration_managers</code> in a region or regions, for all properties use <a href="/services/ssmquicksetup/configuration_managers/"><code>configuration_managers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>configuration_managers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::SSMQuickSetup::ConfigurationManager Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ssmquicksetup.configuration_managers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "manager_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>configuration_managers</code> in a region.
-```sql
-SELECT
-region,
-manager_arn
-FROM awscc.ssmquicksetup.configuration_managers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>configuration_managers_list_only</code> resource, see <a href="/services/ssmquicksetup/configuration_managers/#permissions"><code>configuration_managers</code></a>
-
diff --git a/website/docs/services/ssmquicksetup/index.md b/website/docs/services/ssmquicksetup/index.md
index df5e3331b..3bf1c4de0 100644
--- a/website/docs/services/ssmquicksetup/index.md
+++ b/website/docs/services/ssmquicksetup/index.md
@@ -20,7 +20,7 @@ The ssmquicksetup service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The ssmquicksetup service documentation.
 <a href="/services/ssmquicksetup/configuration_managers/">configuration_managers</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/ssmquicksetup/configuration_managers_list_only/">configuration_managers_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/sso/application_assignments/index.md b/website/docs/services/sso/application_assignments/index.md
index 3569973b8..a8b46f2f9 100644
--- a/website/docs/services/sso/application_assignments/index.md
+++ b/website/docs/services/sso/application_assignments/index.md
@@ -33,6 +33,40 @@ Creates, updates, deletes or gets an <code>application_assignment</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "application_arn",
+    "type": "string",
+    "description": "The ARN of the application."
+  },
+  {
+    "name": "principal_type",
+    "type": "string",
+    "description": "The entity type for which the assignment will be created."
+  },
+  {
+    "name": "principal_id",
+    "type": "string",
+    "description": "An identifier for an object in IAM Identity Center, such as a user or group"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "application_arn",
@@ -55,6 +89,8 @@ Creates, updates, deletes or gets an <code>application_assignment</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-applicationassignment.html"><code>AWS::SSO::ApplicationAssignment</code></a>.
 
@@ -64,26 +100,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>application_assignments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApplicationArn, PrincipalType, PrincipalId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>application_assignments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>application_assignments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>application_assignments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +133,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application_assignment</code>.
 ```sql
 SELECT
@@ -102,6 +152,21 @@ principal_id
 FROM awscc.sso.application_assignments
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationArn>|<PrincipalType>|<PrincipalId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>application_assignments</code> in a region.
+```sql
+SELECT
+region,
+application_arn,
+principal_type,
+principal_id
+FROM awscc.sso.application_assignments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -174,6 +239,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sso/application_assignments_list_only/index.md b/website/docs/services/sso/application_assignments_list_only/index.md
deleted file mode 100644
index 20064ede7..000000000
--- a/website/docs/services/sso/application_assignments_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: application_assignments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - application_assignments_list_only
-  - sso
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>application_assignments</code> in a region or regions, for all properties use <a href="/services/sso/application_assignments/"><code>application_assignments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>application_assignments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for SSO application access grant to a user or group.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sso.application_assignments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_arn",
-    "type": "string",
-    "description": "The ARN of the application."
-  },
-  {
-    "name": "principal_type",
-    "type": "string",
-    "description": "The entity type for which the assignment will be created."
-  },
-  {
-    "name": "principal_id",
-    "type": "string",
-    "description": "An identifier for an object in IAM Identity Center, such as a user or group"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>application_assignments</code> in a region.
-```sql
-SELECT
-region,
-application_arn,
-principal_type,
-principal_id
-FROM awscc.sso.application_assignments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>application_assignments_list_only</code> resource, see <a href="/services/sso/application_assignments/#permissions"><code>application_assignments</code></a>
-
diff --git a/website/docs/services/sso/applications/index.md b/website/docs/services/sso/applications/index.md
index c5c164867..0285eb851 100644
--- a/website/docs/services/sso/applications/index.md
+++ b/website/docs/services/sso/applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -116,6 +125,23 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "application_arn",
+    "type": "string",
+    "description": "The Application ARN that is returned upon creation of the Identity Center (SSO) Application"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-application.html"><code>AWS::SSO::Application</code></a>.
 
@@ -125,31 +151,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, InstanceArn, ApplicationProviderArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -158,6 +190,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application</code>.
 ```sql
 SELECT
@@ -173,6 +214,19 @@ tags
 FROM awscc.sso.applications
 WHERE region = 'us-east-1' AND data__Identifier = '<ApplicationArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>applications</code> in a region.
+```sql
+SELECT
+region,
+application_arn
+FROM awscc.sso.applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -267,6 +321,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sso.applications
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Description": description,
+    "Status": status,
+    "PortalOptions": portal_options,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ApplicationArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sso/applications_list_only/index.md b/website/docs/services/sso/applications_list_only/index.md
deleted file mode 100644
index d06e157a3..000000000
--- a/website/docs/services/sso/applications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - applications_list_only
-  - sso
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>applications</code> in a region or regions, for all properties use <a href="/services/sso/applications/"><code>applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for Identity Center (SSO) Application</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sso.applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "application_arn",
-    "type": "string",
-    "description": "The Application ARN that is returned upon creation of the Identity Center (SSO) Application"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>applications</code> in a region.
-```sql
-SELECT
-region,
-application_arn
-FROM awscc.sso.applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>applications_list_only</code> resource, see <a href="/services/sso/applications/#permissions"><code>applications</code></a>
-
diff --git a/website/docs/services/sso/assignments/index.md b/website/docs/services/sso/assignments/index.md
index f9ef6238b..2921a8e59 100644
--- a/website/docs/services/sso/assignments/index.md
+++ b/website/docs/services/sso/assignments/index.md
@@ -33,6 +33,55 @@ Creates, updates, deletes or gets an <code>assignment</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "instance_arn",
+    "type": "string",
+    "description": "The sso instance that the permission set is owned."
+  },
+  {
+    "name": "target_id",
+    "type": "string",
+    "description": "The account id to be provisioned."
+  },
+  {
+    "name": "target_type",
+    "type": "string",
+    "description": "The type of resource to be provsioned to, only aws account now"
+  },
+  {
+    "name": "permission_set_arn",
+    "type": "string",
+    "description": "The permission set that the assignemt will be assigned"
+  },
+  {
+    "name": "principal_type",
+    "type": "string",
+    "description": "The assignee's type, user/group"
+  },
+  {
+    "name": "principal_id",
+    "type": "string",
+    "description": "The assignee's identifier, user id/group id"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -70,6 +119,8 @@ Creates, updates, deletes or gets an <code>assignment</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-assignment.html"><code>AWS::SSO::Assignment</code></a>.
 
@@ -79,26 +130,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>assignments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, TargetId, TargetType, PermissionSetArn, PrincipalType, PrincipalId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>assignments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>assignments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>assignments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -107,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>assignment</code>.
 ```sql
 SELECT
@@ -120,6 +185,24 @@ principal_id
 FROM awscc.sso.assignments
 WHERE region = 'us-east-1' AND data__Identifier = '<InstanceArn>|<TargetId>|<TargetType>|<PermissionSetArn>|<PrincipalType>|<PrincipalId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>assignments</code> in a region.
+```sql
+SELECT
+region,
+instance_arn,
+target_id,
+target_type,
+permission_set_arn,
+principal_type,
+principal_id
+FROM awscc.sso.assignments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -210,6 +293,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sso/assignments_list_only/index.md b/website/docs/services/sso/assignments_list_only/index.md
deleted file mode 100644
index 072e116d1..000000000
--- a/website/docs/services/sso/assignments_list_only/index.md
+++ /dev/null
@@ -1,110 +0,0 @@
----
-title: assignments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - assignments_list_only
-  - sso
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>assignments</code> in a region or regions, for all properties use <a href="/services/sso/assignments/"><code>assignments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>assignments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for SSO assignmet</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sso.assignments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "instance_arn",
-    "type": "string",
-    "description": "The sso instance that the permission set is owned."
-  },
-  {
-    "name": "target_id",
-    "type": "string",
-    "description": "The account id to be provisioned."
-  },
-  {
-    "name": "target_type",
-    "type": "string",
-    "description": "The type of resource to be provsioned to, only aws account now"
-  },
-  {
-    "name": "permission_set_arn",
-    "type": "string",
-    "description": "The permission set that the assignemt will be assigned"
-  },
-  {
-    "name": "principal_type",
-    "type": "string",
-    "description": "The assignee's type, user/group"
-  },
-  {
-    "name": "principal_id",
-    "type": "string",
-    "description": "The assignee's identifier, user id/group id"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>assignments</code> in a region.
-```sql
-SELECT
-region,
-instance_arn,
-target_id,
-target_type,
-permission_set_arn,
-principal_type,
-principal_id
-FROM awscc.sso.assignments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>assignments_list_only</code> resource, see <a href="/services/sso/assignments/#permissions"><code>assignments</code></a>
-
diff --git a/website/docs/services/sso/index.md b/website/docs/services/sso/index.md
index ce7e5f267..e035f7746 100644
--- a/website/docs/services/sso/index.md
+++ b/website/docs/services/sso/index.md
@@ -20,7 +20,7 @@ The sso service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>12</b></span><br />
+<span>total resources:&nbsp;<b>6</b></span><br />
 </div>
 </div>
 
@@ -30,18 +30,12 @@ The sso service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/sso/application_assignments/">application_assignments</a><br />
-<a href="/services/sso/application_assignments_list_only/">application_assignments_list_only</a><br />
 <a href="/services/sso/applications/">applications</a><br />
-<a href="/services/sso/applications_list_only/">applications_list_only</a><br />
-<a href="/services/sso/assignments/">assignments</a><br />
-<a href="/services/sso/assignments_list_only/">assignments_list_only</a>
+<a href="/services/sso/assignments/">assignments</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/sso/instance_access_control_attribute_configurations/">instance_access_control_attribute_configurations</a><br />
-<a href="/services/sso/instance_access_control_attribute_configurations_list_only/">instance_access_control_attribute_configurations_list_only</a><br />
 <a href="/services/sso/instances/">instances</a><br />
-<a href="/services/sso/instances_list_only/">instances_list_only</a><br />
-<a href="/services/sso/permission_sets/">permission_sets</a><br />
-<a href="/services/sso/permission_sets_list_only/">permission_sets_list_only</a>
+<a href="/services/sso/permission_sets/">permission_sets</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/sso/instance_access_control_attribute_configurations/index.md b/website/docs/services/sso/instance_access_control_attribute_configurations/index.md
index f65377f00..d4d5f6160 100644
--- a/website/docs/services/sso/instance_access_control_attribute_configurations/index.md
+++ b/website/docs/services/sso/instance_access_control_attribute_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>instance_access_control_attribute_con
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "instance_arn",
@@ -100,6 +109,23 @@ Creates, updates, deletes or gets an <code>instance_access_control_attribute_con
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "instance_arn",
+    "type": "string",
+    "description": "The ARN of the AWS SSO instance under which the operation will be executed."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-instanceaccesscontrolattributeconfiguration.html"><code>AWS::SSO::InstanceAccessControlAttributeConfiguration</code></a>.
 
@@ -109,31 +135,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>instance_access_control_attribute_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="InstanceArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>instance_access_control_attribute_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>instance_access_control_attribute_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>instance_access_control_attribute_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>instance_access_control_attribute_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -142,6 +174,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>instance_access_control_attribute_configuration</code>.
 ```sql
 SELECT
@@ -152,6 +193,19 @@ access_control_attributes
 FROM awscc.sso.instance_access_control_attribute_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<InstanceArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>instance_access_control_attribute_configurations</code> in a region.
+```sql
+SELECT
+region,
+instance_arn
+FROM awscc.sso.instance_access_control_attribute_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -225,6 +279,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sso.instance_access_control_attribute_configurations
+SET data__PatchDocument = string('{{ {
+    "InstanceAccessControlAttributeConfiguration": instance_access_control_attribute_configuration,
+    "AccessControlAttributes": access_control_attributes
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InstanceArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sso/instance_access_control_attribute_configurations_list_only/index.md b/website/docs/services/sso/instance_access_control_attribute_configurations_list_only/index.md
deleted file mode 100644
index eff6b5830..000000000
--- a/website/docs/services/sso/instance_access_control_attribute_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: instance_access_control_attribute_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - instance_access_control_attribute_configurations_list_only
-  - sso
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>instance_access_control_attribute_configurations</code> in a region or regions, for all properties use <a href="/services/sso/instance_access_control_attribute_configurations/"><code>instance_access_control_attribute_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>instance_access_control_attribute_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for SSO InstanceAccessControlAttributeConfiguration</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sso.instance_access_control_attribute_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "instance_arn",
-    "type": "string",
-    "description": "The ARN of the AWS SSO instance under which the operation will be executed."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>instance_access_control_attribute_configurations</code> in a region.
-```sql
-SELECT
-region,
-instance_arn
-FROM awscc.sso.instance_access_control_attribute_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>instance_access_control_attribute_configurations_list_only</code> resource, see <a href="/services/sso/instance_access_control_attribute_configurations/#permissions"><code>instance_access_control_attribute_configurations</code></a>
-
diff --git a/website/docs/services/sso/instances/index.md b/website/docs/services/sso/instances/index.md
index 18c9b1133..f3ce12800 100644
--- a/website/docs/services/sso/instances/index.md
+++ b/website/docs/services/sso/instances/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "instance_arn",
+    "type": "string",
+    "description": "The SSO Instance ARN that is returned upon creation of the Identity Center (SSO) Instance"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-instance.html"><code>AWS::SSO::Instance</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>instances_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>instances</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>instance</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.sso.instances
 WHERE region = 'us-east-1' AND data__Identifier = '<InstanceArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>instances</code> in a region.
+```sql
+SELECT
+region,
+instance_arn
+FROM awscc.sso.instances_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +259,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sso.instances
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InstanceArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sso/instances_list_only/index.md b/website/docs/services/sso/instances_list_only/index.md
deleted file mode 100644
index f61bcbbf5..000000000
--- a/website/docs/services/sso/instances_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: instances_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - instances_list_only
-  - sso
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>instances</code> in a region or regions, for all properties use <a href="/services/sso/instances/"><code>instances</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>instances_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for Identity Center (SSO) Instance</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sso.instances_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "instance_arn",
-    "type": "string",
-    "description": "The SSO Instance ARN that is returned upon creation of the Identity Center (SSO) Instance"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>instances</code> in a region.
-```sql
-SELECT
-region,
-instance_arn
-FROM awscc.sso.instances_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>instances_list_only</code> resource, see <a href="/services/sso/instances/#permissions"><code>instances</code></a>
-
diff --git a/website/docs/services/sso/permission_sets/index.md b/website/docs/services/sso/permission_sets/index.md
index 4e253f560..ab964dc31 100644
--- a/website/docs/services/sso/permission_sets/index.md
+++ b/website/docs/services/sso/permission_sets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>permission_set</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -119,6 +128,28 @@ Creates, updates, deletes or gets a <code>permission_set</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "permission_set_arn",
+    "type": "string",
+    "description": "The permission set that the policy will be attached to"
+  },
+  {
+    "name": "instance_arn",
+    "type": "string",
+    "description": "The sso instance arn that the permission set is owned."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-permissionset.html"><code>AWS::SSO::PermissionSet</code></a>.
 
@@ -128,31 +159,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>permission_sets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, InstanceArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>permission_sets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>permission_sets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>permission_sets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>permission_sets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +198,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>permission_set</code>.
 ```sql
 SELECT
@@ -179,6 +225,20 @@ permissions_boundary
 FROM awscc.sso.permission_sets
 WHERE region = 'us-east-1' AND data__Identifier = '<InstanceArn>|<PermissionSetArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>permission_sets</code> in a region.
+```sql
+SELECT
+region,
+instance_arn,
+permission_set_arn
+FROM awscc.sso.permission_sets_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -284,6 +344,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.sso.permission_sets
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "SessionDuration": session_duration,
+    "RelayStateType": relay_state_type,
+    "ManagedPolicies": managed_policies,
+    "InlinePolicy": inline_policy,
+    "Tags": tags,
+    "CustomerManagedPolicyReferences": customer_managed_policy_references,
+    "PermissionsBoundary": permissions_boundary
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<InstanceArn>|<PermissionSetArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/sso/permission_sets_list_only/index.md b/website/docs/services/sso/permission_sets_list_only/index.md
deleted file mode 100644
index a65ff0333..000000000
--- a/website/docs/services/sso/permission_sets_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: permission_sets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - permission_sets_list_only
-  - sso
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>permission_sets</code> in a region or regions, for all properties use <a href="/services/sso/permission_sets/"><code>permission_sets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>permission_sets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for SSO PermissionSet</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sso.permission_sets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "permission_set_arn",
-    "type": "string",
-    "description": "The permission set that the policy will be attached to"
-  },
-  {
-    "name": "instance_arn",
-    "type": "string",
-    "description": "The sso instance arn that the permission set is owned."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>permission_sets</code> in a region.
-```sql
-SELECT
-region,
-instance_arn,
-permission_set_arn
-FROM awscc.sso.permission_sets_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>permission_sets_list_only</code> resource, see <a href="/services/sso/permission_sets/#permissions"><code>permission_sets</code></a>
-
diff --git a/website/docs/services/stepfunctions/activities/index.md b/website/docs/services/stepfunctions/activities/index.md
index b13faf241..20540d012 100644
--- a/website/docs/services/stepfunctions/activities/index.md
+++ b/website/docs/services/stepfunctions/activities/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>activity</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -89,6 +98,23 @@ Creates, updates, deletes or gets an <code>activity</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html"><code>AWS::StepFunctions::Activity</code></a>.
 
@@ -98,31 +124,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>activities</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>activities</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>activities</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>activities_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>activities</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -131,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>activity</code>.
 ```sql
 SELECT
@@ -142,6 +183,19 @@ encryption_configuration
 FROM awscc.stepfunctions.activities
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>activities</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.stepfunctions.activities_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -215,6 +269,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.stepfunctions.activities
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/stepfunctions/activities_list_only/index.md b/website/docs/services/stepfunctions/activities_list_only/index.md
deleted file mode 100644
index 10aa61b9c..000000000
--- a/website/docs/services/stepfunctions/activities_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: activities_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - activities_list_only
-  - stepfunctions
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>activities</code> in a region or regions, for all properties use <a href="/services/stepfunctions/activities/"><code>activities</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>activities_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for Activity</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.stepfunctions.activities_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>activities</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.stepfunctions.activities_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>activities_list_only</code> resource, see <a href="/services/stepfunctions/activities/#permissions"><code>activities</code></a>
-
diff --git a/website/docs/services/stepfunctions/index.md b/website/docs/services/stepfunctions/index.md
index 2ec52003c..3e1f83cc5 100644
--- a/website/docs/services/stepfunctions/index.md
+++ b/website/docs/services/stepfunctions/index.md
@@ -20,7 +20,7 @@ The stepfunctions service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The stepfunctions service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/stepfunctions/activities/">activities</a><br />
-<a href="/services/stepfunctions/activities_list_only/">activities_list_only</a><br />
-<a href="/services/stepfunctions/state_machine_aliases/">state_machine_aliases</a><br />
-<a href="/services/stepfunctions/state_machine_aliases_list_only/">state_machine_aliases_list_only</a>
+<a href="/services/stepfunctions/state_machine_aliases/">state_machine_aliases</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/stepfunctions/state_machine_versions/">state_machine_versions</a><br />
-<a href="/services/stepfunctions/state_machine_versions_list_only/">state_machine_versions_list_only</a><br />
-<a href="/services/stepfunctions/state_machines/">state_machines</a><br />
-<a href="/services/stepfunctions/state_machines_list_only/">state_machines_list_only</a>
+<a href="/services/stepfunctions/state_machines/">state_machines</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/stepfunctions/state_machine_aliases/index.md b/website/docs/services/stepfunctions/state_machine_aliases/index.md
index 342f199d0..9e6403335 100644
--- a/website/docs/services/stepfunctions/state_machine_aliases/index.md
+++ b/website/docs/services/stepfunctions/state_machine_aliases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>state_machine_alias</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -104,6 +113,23 @@ Creates, updates, deletes or gets a <code>state_machine_alias</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The ARN of the alias."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachinealias.html"><code>AWS::StepFunctions::StateMachineAlias</code></a>.
 
@@ -113,31 +139,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>state_machine_aliases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>state_machine_aliases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>state_machine_aliases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>state_machine_aliases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>state_machine_aliases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -146,6 +178,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>state_machine_alias</code>.
 ```sql
 SELECT
@@ -158,6 +199,19 @@ deployment_preference
 FROM awscc.stepfunctions.state_machine_aliases
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>state_machine_aliases</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.stepfunctions.state_machine_aliases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -244,6 +298,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.stepfunctions.state_machine_aliases
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "RoutingConfiguration": routing_configuration,
+    "DeploymentPreference": deployment_preference
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/stepfunctions/state_machine_aliases_list_only/index.md b/website/docs/services/stepfunctions/state_machine_aliases_list_only/index.md
deleted file mode 100644
index 809e3dc96..000000000
--- a/website/docs/services/stepfunctions/state_machine_aliases_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: state_machine_aliases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - state_machine_aliases_list_only
-  - stepfunctions
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>state_machine_aliases</code> in a region or regions, for all properties use <a href="/services/stepfunctions/state_machine_aliases/"><code>state_machine_aliases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>state_machine_aliases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for StateMachineAlias</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.stepfunctions.state_machine_aliases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The ARN of the alias."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>state_machine_aliases</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.stepfunctions.state_machine_aliases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>state_machine_aliases_list_only</code> resource, see <a href="/services/stepfunctions/state_machine_aliases/#permissions"><code>state_machine_aliases</code></a>
-
diff --git a/website/docs/services/stepfunctions/state_machine_versions/index.md b/website/docs/services/stepfunctions/state_machine_versions/index.md
index e22f97d03..bab284423 100644
--- a/website/docs/services/stepfunctions/state_machine_versions/index.md
+++ b/website/docs/services/stepfunctions/state_machine_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>state_machine_version</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets a <code>state_machine_version</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachineversion.html"><code>AWS::StepFunctions::StateMachineVersion</code></a>.
 
@@ -69,26 +95,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>state_machine_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="StateMachineArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>state_machine_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>state_machine_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>state_machine_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +128,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>state_machine_version</code>.
 ```sql
 SELECT
@@ -108,6 +148,19 @@ description
 FROM awscc.stepfunctions.state_machine_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>state_machine_versions</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.stepfunctions.state_machine_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -176,6 +229,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/stepfunctions/state_machine_versions_list_only/index.md b/website/docs/services/stepfunctions/state_machine_versions_list_only/index.md
deleted file mode 100644
index ddc7e0686..000000000
--- a/website/docs/services/stepfunctions/state_machine_versions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: state_machine_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - state_machine_versions_list_only
-  - stepfunctions
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>state_machine_versions</code> in a region or regions, for all properties use <a href="/services/stepfunctions/state_machine_versions/"><code>state_machine_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>state_machine_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for StateMachineVersion</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.stepfunctions.state_machine_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>state_machine_versions</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.stepfunctions.state_machine_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>state_machine_versions_list_only</code> resource, see <a href="/services/stepfunctions/state_machine_versions/#permissions"><code>state_machine_versions</code></a>
-
diff --git a/website/docs/services/stepfunctions/state_machines/index.md b/website/docs/services/stepfunctions/state_machines/index.md
index 53f112eec..a8b1c0451 100644
--- a/website/docs/services/stepfunctions/state_machines/index.md
+++ b/website/docs/services/stepfunctions/state_machines/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>state_machine</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -194,6 +203,23 @@ Creates, updates, deletes or gets a <code>state_machine</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html"><code>AWS::StepFunctions::StateMachine</code></a>.
 
@@ -203,31 +229,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>state_machines</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="RoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>state_machines</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>state_machines</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>state_machines_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>state_machines</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -236,6 +268,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>state_machine</code>.
 ```sql
 SELECT
@@ -257,6 +298,19 @@ tags
 FROM awscc.stepfunctions.state_machines
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>state_machines</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.stepfunctions.state_machines_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -371,6 +425,27 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.stepfunctions.state_machines
+SET data__PatchDocument = string('{{ {
+    "DefinitionString": definition_string,
+    "RoleArn": role_arn,
+    "LoggingConfiguration": logging_configuration,
+    "TracingConfiguration": tracing_configuration,
+    "EncryptionConfiguration": encryption_configuration,
+    "DefinitionS3Location": definition_s3_location,
+    "DefinitionSubstitutions": definition_substitutions,
+    "Definition": definition,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/stepfunctions/state_machines_list_only/index.md b/website/docs/services/stepfunctions/state_machines_list_only/index.md
deleted file mode 100644
index 5ec745f4b..000000000
--- a/website/docs/services/stepfunctions/state_machines_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: state_machines_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - state_machines_list_only
-  - stepfunctions
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>state_machines</code> in a region or regions, for all properties use <a href="/services/stepfunctions/state_machines/"><code>state_machines</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>state_machines_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for StateMachine</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.stepfunctions.state_machines_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>state_machines</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.stepfunctions.state_machines_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>state_machines_list_only</code> resource, see <a href="/services/stepfunctions/state_machines/#permissions"><code>state_machines</code></a>
-
diff --git a/website/docs/services/supportapp/account_aliases/index.md b/website/docs/services/supportapp/account_aliases/index.md
index a81721c9c..b4e4d41e4 100644
--- a/website/docs/services/supportapp/account_aliases/index.md
+++ b/website/docs/services/supportapp/account_aliases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>account_alias</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "account_alias",
@@ -50,6 +59,28 @@ Creates, updates, deletes or gets an <code>account_alias</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "account_alias",
+    "type": "string",
+    "description": "An account alias associated with a customer's account."
+  },
+  {
+    "name": "account_alias_resource_id",
+    "type": "string",
+    "description": "Unique identifier representing an alias tied to an account"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-supportapp-accountalias.html"><code>AWS::SupportApp::AccountAlias</code></a>.
 
@@ -59,31 +90,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>account_aliases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AccountAlias, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>account_aliases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>account_aliases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>account_aliases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>account_aliases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +129,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>account_alias</code>.
 ```sql
 SELECT
@@ -101,6 +147,19 @@ account_alias_resource_id
 FROM awscc.supportapp.account_aliases
 WHERE region = 'us-east-1' AND data__Identifier = '<AccountAliasResourceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>account_aliases</code> in a region.
+```sql
+SELECT
+region,
+account_alias_resource_id
+FROM awscc.supportapp.account_aliases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -161,6 +220,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.supportapp.account_aliases
+SET data__PatchDocument = string('{{ {
+    "AccountAlias": account_alias
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccountAliasResourceId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/supportapp/account_aliases_list_only/index.md b/website/docs/services/supportapp/account_aliases_list_only/index.md
deleted file mode 100644
index ff5ff0cd0..000000000
--- a/website/docs/services/supportapp/account_aliases_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: account_aliases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - account_aliases_list_only
-  - supportapp
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>account_aliases</code> in a region or regions, for all properties use <a href="/services/supportapp/account_aliases/"><code>account_aliases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>account_aliases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An AWS Support App resource that creates, updates, reads, and deletes a customer's account alias.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.supportapp.account_aliases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "account_alias",
-    "type": "string",
-    "description": "An account alias associated with a customer's account."
-  },
-  {
-    "name": "account_alias_resource_id",
-    "type": "string",
-    "description": "Unique identifier representing an alias tied to an account"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>account_aliases</code> in a region.
-```sql
-SELECT
-region,
-account_alias_resource_id
-FROM awscc.supportapp.account_aliases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>account_aliases_list_only</code> resource, see <a href="/services/supportapp/account_aliases/#permissions"><code>account_aliases</code></a>
-
diff --git a/website/docs/services/supportapp/index.md b/website/docs/services/supportapp/index.md
index 0bad67fae..09001756e 100644
--- a/website/docs/services/supportapp/index.md
+++ b/website/docs/services/supportapp/index.md
@@ -20,7 +20,7 @@ The supportapp service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The supportapp service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/supportapp/account_aliases/">account_aliases</a><br />
-<a href="/services/supportapp/account_aliases_list_only/">account_aliases_list_only</a><br />
 <a href="/services/supportapp/slack_channel_configurations/">slack_channel_configurations</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/supportapp/slack_channel_configurations_list_only/">slack_channel_configurations_list_only</a><br />
-<a href="/services/supportapp/slack_workspace_configurations/">slack_workspace_configurations</a><br />
-<a href="/services/supportapp/slack_workspace_configurations_list_only/">slack_workspace_configurations_list_only</a>
+<a href="/services/supportapp/slack_workspace_configurations/">slack_workspace_configurations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/supportapp/slack_channel_configurations/index.md b/website/docs/services/supportapp/slack_channel_configurations/index.md
index 5eabd660c..c929fd66e 100644
--- a/website/docs/services/supportapp/slack_channel_configurations/index.md
+++ b/website/docs/services/supportapp/slack_channel_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>slack_channel_configuration</code> res
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "team_id",
@@ -80,6 +89,28 @@ Creates, updates, deletes or gets a <code>slack_channel_configuration</code> res
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "team_id",
+    "type": "string",
+    "description": "The team ID in Slack, which uniquely identifies a workspace."
+  },
+  {
+    "name": "channel_id",
+    "type": "string",
+    "description": "The channel ID in Slack, which identifies a channel within a workspace."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-supportapp-slackchannelconfiguration.html"><code>AWS::SupportApp::SlackChannelConfiguration</code></a>.
 
@@ -89,31 +120,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>slack_channel_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TeamId, ChannelId, NotifyOnCaseSeverity, ChannelRoleArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>slack_channel_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>slack_channel_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>slack_channel_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>slack_channel_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -122,6 +159,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>slack_channel_configuration</code>.
 ```sql
 SELECT
@@ -137,6 +183,20 @@ channel_role_arn
 FROM awscc.supportapp.slack_channel_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<TeamId>|<ChannelId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>slack_channel_configurations</code> in a region.
+```sql
+SELECT
+region,
+team_id,
+channel_id
+FROM awscc.supportapp.slack_channel_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -231,6 +291,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.supportapp.slack_channel_configurations
+SET data__PatchDocument = string('{{ {
+    "ChannelName": channel_name,
+    "NotifyOnCreateOrReopenCase": notify_on_create_or_reopen_case,
+    "NotifyOnAddCorrespondenceToCase": notify_on_add_correspondence_to_case,
+    "NotifyOnResolveCase": notify_on_resolve_case,
+    "NotifyOnCaseSeverity": notify_on_case_severity,
+    "ChannelRoleArn": channel_role_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TeamId>|<ChannelId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/supportapp/slack_channel_configurations_list_only/index.md b/website/docs/services/supportapp/slack_channel_configurations_list_only/index.md
deleted file mode 100644
index 320c9066a..000000000
--- a/website/docs/services/supportapp/slack_channel_configurations_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: slack_channel_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - slack_channel_configurations_list_only
-  - supportapp
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>slack_channel_configurations</code> in a region or regions, for all properties use <a href="/services/supportapp/slack_channel_configurations/"><code>slack_channel_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>slack_channel_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An AWS Support App resource that creates, updates, lists and deletes Slack channel configurations.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.supportapp.slack_channel_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "team_id",
-    "type": "string",
-    "description": "The team ID in Slack, which uniquely identifies a workspace."
-  },
-  {
-    "name": "channel_id",
-    "type": "string",
-    "description": "The channel ID in Slack, which identifies a channel within a workspace."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>slack_channel_configurations</code> in a region.
-```sql
-SELECT
-region,
-team_id,
-channel_id
-FROM awscc.supportapp.slack_channel_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>slack_channel_configurations_list_only</code> resource, see <a href="/services/supportapp/slack_channel_configurations/#permissions"><code>slack_channel_configurations</code></a>
-
diff --git a/website/docs/services/supportapp/slack_workspace_configurations/index.md b/website/docs/services/supportapp/slack_workspace_configurations/index.md
index c399e7770..2840f64db 100644
--- a/website/docs/services/supportapp/slack_workspace_configurations/index.md
+++ b/website/docs/services/supportapp/slack_workspace_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>slack_workspace_configuration</code> r
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "team_id",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>slack_workspace_configuration</code> r
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "team_id",
+    "type": "string",
+    "description": "The team ID in Slack, which uniquely identifies a workspace."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-supportapp-slackworkspaceconfiguration.html"><code>AWS::SupportApp::SlackWorkspaceConfiguration</code></a>.
 
@@ -59,31 +85,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>slack_workspace_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="TeamId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>slack_workspace_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>slack_workspace_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>slack_workspace_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>slack_workspace_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +124,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>slack_workspace_configuration</code>.
 ```sql
 SELECT
@@ -101,6 +142,19 @@ version_id
 FROM awscc.supportapp.slack_workspace_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<TeamId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>slack_workspace_configurations</code> in a region.
+```sql
+SELECT
+region,
+team_id
+FROM awscc.supportapp.slack_workspace_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -165,6 +219,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.supportapp.slack_workspace_configurations
+SET data__PatchDocument = string('{{ {
+    "VersionId": version_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TeamId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/supportapp/slack_workspace_configurations_list_only/index.md b/website/docs/services/supportapp/slack_workspace_configurations_list_only/index.md
deleted file mode 100644
index 0d66f3307..000000000
--- a/website/docs/services/supportapp/slack_workspace_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: slack_workspace_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - slack_workspace_configurations_list_only
-  - supportapp
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>slack_workspace_configurations</code> in a region or regions, for all properties use <a href="/services/supportapp/slack_workspace_configurations/"><code>slack_workspace_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>slack_workspace_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>An AWS Support App resource that creates, updates, lists, and deletes Slack workspace configurations.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.supportapp.slack_workspace_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "team_id",
-    "type": "string",
-    "description": "The team ID in Slack, which uniquely identifies a workspace."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>slack_workspace_configurations</code> in a region.
-```sql
-SELECT
-region,
-team_id
-FROM awscc.supportapp.slack_workspace_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>slack_workspace_configurations_list_only</code> resource, see <a href="/services/supportapp/slack_workspace_configurations/#permissions"><code>slack_workspace_configurations</code></a>
-
diff --git a/website/docs/services/synthetics/canaries/index.md b/website/docs/services/synthetics/canaries/index.md
index 1151a07da..7e450c7c6 100644
--- a/website/docs/services/synthetics/canaries/index.md
+++ b/website/docs/services/synthetics/canaries/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>canary</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -339,6 +348,23 @@ Creates, updates, deletes or gets a <code>canary</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Name of the canary."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html"><code>AWS::Synthetics::Canary</code></a>.
 
@@ -348,31 +374,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>canaries</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Code, ArtifactS3Location, ExecutionRoleArn, Schedule, RuntimeVersion, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>canaries</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>canaries</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>canaries_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>canaries</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -381,6 +413,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>canary</code>.
 ```sql
 SELECT
@@ -410,6 +451,19 @@ visual_references
 FROM awscc.synthetics.canaries
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>canaries</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.synthetics.canaries_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -594,6 +648,36 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.synthetics.canaries
+SET data__PatchDocument = string('{{ {
+    "ArtifactS3Location": artifact_s3_location,
+    "ArtifactConfig": artifact_config,
+    "Schedule": schedule,
+    "ExecutionRoleArn": execution_role_arn,
+    "RuntimeVersion": runtime_version,
+    "SuccessRetentionPeriod": success_retention_period,
+    "FailureRetentionPeriod": failure_retention_period,
+    "Tags": tags,
+    "VPCConfig": vpc_config,
+    "RunConfig": run_config,
+    "StartCanaryAfterCreation": start_canary_after_creation,
+    "VisualReference": visual_reference,
+    "DeleteLambdaResourcesOnCanaryDeletion": delete_lambda_resources_on_canary_deletion,
+    "ResourcesToReplicateTags": resources_to_replicate_tags,
+    "ProvisionedResourceCleanup": provisioned_resource_cleanup,
+    "DryRunAndUpdate": dry_run_and_update,
+    "BrowserConfigs": browser_configs,
+    "VisualReferences": visual_references
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/synthetics/canaries_list_only/index.md b/website/docs/services/synthetics/canaries_list_only/index.md
deleted file mode 100644
index d45833a75..000000000
--- a/website/docs/services/synthetics/canaries_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: canaries_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - canaries_list_only
-  - synthetics
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>canaries</code> in a region or regions, for all properties use <a href="/services/synthetics/canaries/"><code>canaries</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>canaries_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Synthetics::Canary</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.synthetics.canaries_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Name of the canary."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>canaries</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.synthetics.canaries_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>canaries_list_only</code> resource, see <a href="/services/synthetics/canaries/#permissions"><code>canaries</code></a>
-
diff --git a/website/docs/services/synthetics/groups/index.md b/website/docs/services/synthetics/groups/index.md
index 099927091..ebe96141b 100644
--- a/website/docs/services/synthetics/groups/index.md
+++ b/website/docs/services/synthetics/groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>group</code> resource or lists <code>g
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "name",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>group</code> resource or lists <code>g
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Name of the group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-group.html"><code>AWS::Synthetics::Group</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>group</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ resource_arns
 FROM awscc.synthetics.groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Name>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>groups</code> in a region.
+```sql
+SELECT
+region,
+name
+FROM awscc.synthetics.groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -196,6 +250,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.synthetics.groups
+SET data__PatchDocument = string('{{ {
+    "Tags": tags,
+    "ResourceArns": resource_arns
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/synthetics/groups_list_only/index.md b/website/docs/services/synthetics/groups_list_only/index.md
deleted file mode 100644
index 70c12551e..000000000
--- a/website/docs/services/synthetics/groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - groups_list_only
-  - synthetics
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>groups</code> in a region or regions, for all properties use <a href="/services/synthetics/groups/"><code>groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Synthetics::Group</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.synthetics.groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Name of the group."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>groups</code> in a region.
-```sql
-SELECT
-region,
-name
-FROM awscc.synthetics.groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>groups_list_only</code> resource, see <a href="/services/synthetics/groups/#permissions"><code>groups</code></a>
-
diff --git a/website/docs/services/synthetics/index.md b/website/docs/services/synthetics/index.md
index 276d4871f..388c63dc8 100644
--- a/website/docs/services/synthetics/index.md
+++ b/website/docs/services/synthetics/index.md
@@ -20,7 +20,7 @@ The synthetics service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,9 @@ The synthetics service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/synthetics/canaries/">canaries</a><br />
-<a href="/services/synthetics/canaries_list_only/">canaries_list_only</a>
+<a href="/services/synthetics/canaries/">canaries</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/synthetics/groups/">groups</a><br />
-<a href="/services/synthetics/groups_list_only/">groups_list_only</a>
+<a href="/services/synthetics/groups/">groups</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/systemsmanagersap/applications/index.md b/website/docs/services/systemsmanagersap/applications/index.md
index dde604ba3..7c8faa523 100644
--- a/website/docs/services/systemsmanagersap/applications/index.md
+++ b/website/docs/services/systemsmanagersap/applications/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "application_id",
@@ -136,6 +145,23 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The ARN of the SSM-SAP application"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-systemsmanagersap-application.html"><code>AWS::SystemsManagerSAP::Application</code></a>.
 
@@ -145,31 +171,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApplicationId, ApplicationType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>applications_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>applications</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -178,6 +210,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>application</code>.
 ```sql
 SELECT
@@ -195,6 +236,19 @@ components_info
 FROM awscc.systemsmanagersap.applications
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>applications</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.systemsmanagersap.applications_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -298,6 +352,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.systemsmanagersap.applications
+SET data__PatchDocument = string('{{ {
+    "ApplicationId": application_id,
+    "ApplicationType": application_type,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/systemsmanagersap/applications_list_only/index.md b/website/docs/services/systemsmanagersap/applications_list_only/index.md
deleted file mode 100644
index bb3dcac8a..000000000
--- a/website/docs/services/systemsmanagersap/applications_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: applications_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - applications_list_only
-  - systemsmanagersap
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>applications</code> in a region or regions, for all properties use <a href="/services/systemsmanagersap/applications/"><code>applications</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>applications_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource schema for AWS::SystemsManagerSAP::Application</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.systemsmanagersap.applications_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "The ARN of the SSM-SAP application"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>applications</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.systemsmanagersap.applications_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>applications_list_only</code> resource, see <a href="/services/systemsmanagersap/applications/#permissions"><code>applications</code></a>
-
diff --git a/website/docs/services/systemsmanagersap/index.md b/website/docs/services/systemsmanagersap/index.md
index 4dd0c39c1..c090eaea2 100644
--- a/website/docs/services/systemsmanagersap/index.md
+++ b/website/docs/services/systemsmanagersap/index.md
@@ -20,7 +20,7 @@ The systemsmanagersap service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The systemsmanagersap service documentation.
 <a href="/services/systemsmanagersap/applications/">applications</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/systemsmanagersap/applications_list_only/">applications_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/tagging/compliance_summary/index.md b/website/docs/services/tagging/compliance_summary/index.md
index cfd0ef3bb..567be88ee 100644
--- a/website/docs/services/tagging/compliance_summary/index.md
+++ b/website/docs/services/tagging/compliance_summary/index.md
@@ -57,3 +57,4 @@ Returns a table that shows counts of resources that are noncompliant with their
 
 
 
+
diff --git a/website/docs/services/tagging/report_creation/index.md b/website/docs/services/tagging/report_creation/index.md
index 7cb1c82fc..b2752d8f4 100644
--- a/website/docs/services/tagging/report_creation/index.md
+++ b/website/docs/services/tagging/report_creation/index.md
@@ -57,3 +57,4 @@ Describes the status of the StartReportCreation operation for generating a repor
 
 
 
+
diff --git a/website/docs/services/tagging/tag_keys/index.md b/website/docs/services/tagging/tag_keys/index.md
index 94cfa6a48..8e020ad55 100644
--- a/website/docs/services/tagging/tag_keys/index.md
+++ b/website/docs/services/tagging/tag_keys/index.md
@@ -57,3 +57,4 @@ Returns all tag keys currently in use in the specified AWS Region for the callin
 
 
 
+
diff --git a/website/docs/services/tagging/tag_values/index.md b/website/docs/services/tagging/tag_values/index.md
index baa8f3d79..966002a9d 100644
--- a/website/docs/services/tagging/tag_values/index.md
+++ b/website/docs/services/tagging/tag_values/index.md
@@ -57,3 +57,4 @@ Returns all tag values for the specified key that are used in the specified AWS
 
 
 
+
diff --git a/website/docs/services/tagging/tagged_resources/index.md b/website/docs/services/tagging/tagged_resources/index.md
index 7644826f6..90984372a 100644
--- a/website/docs/services/tagging/tagged_resources/index.md
+++ b/website/docs/services/tagging/tagged_resources/index.md
@@ -57,3 +57,4 @@ Returns all the tagged or previously tagged resources that are located in the sp
 
 
 
+
diff --git a/website/docs/services/timestream/databases/index.md b/website/docs/services/timestream/databases/index.md
index 43d37755d..03944d8c1 100644
--- a/website/docs/services/timestream/databases/index.md
+++ b/website/docs/services/timestream/databases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>database</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>database</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "database_name",
+    "type": "string",
+    "description": "The name for the database. If you don't specify a name, AWS CloudFormation generates a unique physical ID and uses that ID for the database name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-database.html"><code>AWS::Timestream::Database</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>databases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>databases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>databases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>databases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>databases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>database</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ tags
 FROM awscc.timestream.databases
 WHERE region = 'us-east-1' AND data__Identifier = '<DatabaseName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>databases</code> in a region.
+```sql
+SELECT
+region,
+database_name
+FROM awscc.timestream.databases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -199,6 +253,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.timestream.databases
+SET data__PatchDocument = string('{{ {
+    "KmsKeyId": kms_key_id,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DatabaseName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/timestream/databases_list_only/index.md b/website/docs/services/timestream/databases_list_only/index.md
deleted file mode 100644
index 197277cf1..000000000
--- a/website/docs/services/timestream/databases_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: databases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - databases_list_only
-  - timestream
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>databases</code> in a region or regions, for all properties use <a href="/services/timestream/databases/"><code>databases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>databases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Timestream::Database resource creates a Timestream database.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.timestream.databases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "database_name",
-    "type": "string",
-    "description": "The name for the database. If you don't specify a name, AWS CloudFormation generates a unique physical ID and uses that ID for the database name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>databases</code> in a region.
-```sql
-SELECT
-region,
-database_name
-FROM awscc.timestream.databases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>databases_list_only</code> resource, see <a href="/services/timestream/databases/#permissions"><code>databases</code></a>
-
diff --git a/website/docs/services/timestream/index.md b/website/docs/services/timestream/index.md
index 2d1bdc13a..15a646799 100644
--- a/website/docs/services/timestream/index.md
+++ b/website/docs/services/timestream/index.md
@@ -20,7 +20,7 @@ The timestream service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The timestream service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/timestream/databases/">databases</a><br />
-<a href="/services/timestream/databases_list_only/">databases_list_only</a><br />
-<a href="/services/timestream/influxdb_instances/">influxdb_instances</a><br />
-<a href="/services/timestream/influxdb_instances_list_only/">influxdb_instances_list_only</a>
+<a href="/services/timestream/influxdb_instances/">influxdb_instances</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/timestream/scheduled_queries/">scheduled_queries</a><br />
-<a href="/services/timestream/scheduled_queries_list_only/">scheduled_queries_list_only</a><br />
-<a href="/services/timestream/tables/">tables</a><br />
-<a href="/services/timestream/tables_list_only/">tables_list_only</a>
+<a href="/services/timestream/tables/">tables</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/timestream/influxdb_instances/index.md b/website/docs/services/timestream/influxdb_instances/index.md
index 89c71d21a..0e257adc4 100644
--- a/website/docs/services/timestream/influxdb_instances/index.md
+++ b/website/docs/services/timestream/influxdb_instances/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>influxdb_instance</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "username",
@@ -191,6 +200,23 @@ Creates, updates, deletes or gets an <code>influxdb_instance</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "The service generated unique identifier for InfluxDB instance."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-influxdbinstance.html"><code>AWS::Timestream::InfluxDBInstance</code></a>.
 
@@ -200,31 +226,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>influxdb_instances</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>influxdb_instances</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>influxdb_instances</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>influxdb_instances_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>influxdb_instances</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -233,6 +265,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>influxdb_instance</code>.
 ```sql
 SELECT
@@ -264,6 +305,19 @@ tags
 FROM awscc.timestream.influxdb_instances
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>influxdb_instances</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.timestream.influxdb_instances_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -427,6 +481,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.timestream.influxdb_instances
+SET data__PatchDocument = string('{{ {
+    "DbInstanceType": db_instance_type,
+    "DbStorageType": db_storage_type,
+    "AllocatedStorage": allocated_storage,
+    "DbParameterGroupIdentifier": db_parameter_group_identifier,
+    "Port": port,
+    "LogDeliveryConfiguration": log_delivery_configuration,
+    "DeploymentType": deployment_type,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/timestream/influxdb_instances_list_only/index.md b/website/docs/services/timestream/influxdb_instances_list_only/index.md
deleted file mode 100644
index 3d0787dd8..000000000
--- a/website/docs/services/timestream/influxdb_instances_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: influxdb_instances_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - influxdb_instances_list_only
-  - timestream
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>influxdb_instances</code> in a region or regions, for all properties use <a href="/services/timestream/influxdb_instances/"><code>influxdb_instances</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>influxdb_instances_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Timestream::InfluxDBInstance resource creates an InfluxDB instance.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.timestream.influxdb_instances_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "The service generated unique identifier for InfluxDB instance."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>influxdb_instances</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.timestream.influxdb_instances_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>influxdb_instances_list_only</code> resource, see <a href="/services/timestream/influxdb_instances/#permissions"><code>influxdb_instances</code></a>
-
diff --git a/website/docs/services/timestream/scheduled_queries/index.md b/website/docs/services/timestream/scheduled_queries/index.md
index 6b1097ef6..c21d0191c 100644
--- a/website/docs/services/timestream/scheduled_queries/index.md
+++ b/website/docs/services/timestream/scheduled_queries/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>scheduled_query</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -287,6 +296,23 @@ Creates, updates, deletes or gets a <code>scheduled_query</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Amazon Resource Name of the scheduled query that is generated upon creation."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-scheduledquery.html"><code>AWS::Timestream::ScheduledQuery</code></a>.
 
@@ -296,31 +322,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>scheduled_queries</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="QueryString, ScheduleConfiguration, NotificationConfiguration, ScheduledQueryExecutionRoleArn, ErrorReportConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>scheduled_queries</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>scheduled_queries</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>scheduled_queries_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>scheduled_queries</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -329,6 +361,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>scheduled_query</code>.
 ```sql
 SELECT
@@ -355,6 +396,19 @@ tags
 FROM awscc.timestream.scheduled_queries
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>scheduled_queries</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.timestream.scheduled_queries_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -488,6 +542,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.timestream.scheduled_queries
+SET data__PatchDocument = string('{{ {
+    "ClientToken": client_token,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/timestream/scheduled_queries_list_only/index.md b/website/docs/services/timestream/scheduled_queries_list_only/index.md
deleted file mode 100644
index b7299bf10..000000000
--- a/website/docs/services/timestream/scheduled_queries_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: scheduled_queries_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - scheduled_queries_list_only
-  - timestream
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>scheduled_queries</code> in a region or regions, for all properties use <a href="/services/timestream/scheduled_queries/"><code>scheduled_queries</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>scheduled_queries_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Timestream::ScheduledQuery resource creates a Timestream Scheduled Query.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.timestream.scheduled_queries_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Amazon Resource Name of the scheduled query that is generated upon creation."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>scheduled_queries</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.timestream.scheduled_queries_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>scheduled_queries_list_only</code> resource, see <a href="/services/timestream/scheduled_queries/#permissions"><code>scheduled_queries</code></a>
-
diff --git a/website/docs/services/timestream/tables/index.md b/website/docs/services/timestream/tables/index.md
index 71d694ac7..670101cf2 100644
--- a/website/docs/services/timestream/tables/index.md
+++ b/website/docs/services/timestream/tables/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>table</code> resource or lists <code>t
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -169,6 +178,33 @@ Creates, updates, deletes or gets a <code>table</code> resource or lists <code>t
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The table name exposed as a read-only attribute."
+  },
+  {
+    "name": "database_name",
+    "type": "string",
+    "description": "The name for the database which the table to be created belongs to."
+  },
+  {
+    "name": "table_name",
+    "type": "string",
+    "description": "The name for the table. If you don't specify a name, AWS CloudFormation generates a unique physical ID and uses that ID for the table name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-table.html"><code>AWS::Timestream::Table</code></a>.
 
@@ -178,31 +214,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DatabaseName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>tables_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>tables</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -211,6 +253,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>table</code>.
 ```sql
 SELECT
@@ -226,6 +277,20 @@ tags
 FROM awscc.timestream.tables
 WHERE region = 'us-east-1' AND data__Identifier = '<DatabaseName>|<TableName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>tables</code> in a region.
+```sql
+SELECT
+region,
+database_name,
+table_name
+FROM awscc.timestream.tables_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -321,6 +386,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.timestream.tables
+SET data__PatchDocument = string('{{ {
+    "RetentionProperties": retention_properties,
+    "Schema": schema,
+    "MagneticStoreWriteProperties": magnetic_store_write_properties,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DatabaseName>|<TableName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/timestream/tables_list_only/index.md b/website/docs/services/timestream/tables_list_only/index.md
deleted file mode 100644
index a0d9d61f9..000000000
--- a/website/docs/services/timestream/tables_list_only/index.md
+++ /dev/null
@@ -1,91 +0,0 @@
----
-title: tables_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - tables_list_only
-  - timestream
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>tables</code> in a region or regions, for all properties use <a href="/services/timestream/tables/"><code>tables</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>tables_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::Timestream::Table resource creates a Timestream Table.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.timestream.tables_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "The table name exposed as a read-only attribute."
-  },
-  {
-    "name": "database_name",
-    "type": "string",
-    "description": "The name for the database which the table to be created belongs to."
-  },
-  {
-    "name": "table_name",
-    "type": "string",
-    "description": "The name for the table. If you don't specify a name, AWS CloudFormation generates a unique physical ID and uses that ID for the table name."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>tables</code> in a region.
-```sql
-SELECT
-region,
-database_name,
-table_name
-FROM awscc.timestream.tables_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>tables_list_only</code> resource, see <a href="/services/timestream/tables/#permissions"><code>tables</code></a>
-
diff --git a/website/docs/services/transfer/agreements/index.md b/website/docs/services/transfer/agreements/index.md
index e7a61c073..30d7348ac 100644
--- a/website/docs/services/transfer/agreements/index.md
+++ b/website/docs/services/transfer/agreements/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>agreement</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -144,6 +153,28 @@ Creates, updates, deletes or gets an <code>agreement</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "server_id",
+    "type": "string",
+    "description": "A unique identifier for the server."
+  },
+  {
+    "name": "agreement_id",
+    "type": "string",
+    "description": "A unique identifier for the agreement."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-agreement.html"><code>AWS::Transfer::Agreement</code></a>.
 
@@ -153,31 +184,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>agreements</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ServerId, LocalProfileId, PartnerProfileId, AccessRole, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>agreements</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>agreements</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>agreements_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>agreements</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -186,6 +223,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>agreement</code>.
 ```sql
 SELECT
@@ -206,6 +252,20 @@ custom_directories
 FROM awscc.transfer.agreements
 WHERE region = 'us-east-1' AND data__Identifier = '<AgreementId>|<ServerId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>agreements</code> in a region.
+```sql
+SELECT
+region,
+agreement_id,
+server_id
+FROM awscc.transfer.agreements_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -319,6 +379,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.transfer.agreements
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "LocalProfileId": local_profile_id,
+    "PartnerProfileId": partner_profile_id,
+    "BaseDirectory": base_directory,
+    "AccessRole": access_role,
+    "Status": status,
+    "Tags": tags,
+    "PreserveFilename": preserve_filename,
+    "EnforceMessageSigning": enforce_message_signing,
+    "CustomDirectories": custom_directories
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AgreementId>|<ServerId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/transfer/agreements_list_only/index.md b/website/docs/services/transfer/agreements_list_only/index.md
deleted file mode 100644
index dee42ee56..000000000
--- a/website/docs/services/transfer/agreements_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: agreements_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - agreements_list_only
-  - transfer
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>agreements</code> in a region or regions, for all properties use <a href="/services/transfer/agreements/"><code>agreements</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>agreements_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Transfer::Agreement</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.transfer.agreements_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "server_id",
-    "type": "string",
-    "description": "A unique identifier for the server."
-  },
-  {
-    "name": "agreement_id",
-    "type": "string",
-    "description": "A unique identifier for the agreement."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>agreements</code> in a region.
-```sql
-SELECT
-region,
-agreement_id,
-server_id
-FROM awscc.transfer.agreements_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>agreements_list_only</code> resource, see <a href="/services/transfer/agreements/#permissions"><code>agreements</code></a>
-
diff --git a/website/docs/services/transfer/certificates/index.md b/website/docs/services/transfer/certificates/index.md
index 52615c023..9a477615e 100644
--- a/website/docs/services/transfer/certificates/index.md
+++ b/website/docs/services/transfer/certificates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>certificate</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "usage",
@@ -127,6 +136,28 @@ Creates, updates, deletes or gets a <code>certificate</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "certificate",
+    "type": "string",
+    "description": "Specifies the certificate body to be imported."
+  },
+  {
+    "name": "certificate_id",
+    "type": "string",
+    "description": "A unique identifier for the certificate."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-certificate.html"><code>AWS::Transfer::Certificate</code></a>.
 
@@ -136,31 +167,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>certificates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Certificate, Usage, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>certificates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>certificates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>certificates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>certificates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -169,6 +206,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>certificate</code>.
 ```sql
 SELECT
@@ -191,6 +237,19 @@ not_after_date
 FROM awscc.transfer.certificates
 WHERE region = 'us-east-1' AND data__Identifier = '<CertificateId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>certificates</code> in a region.
+```sql
+SELECT
+region,
+certificate_id
+FROM awscc.transfer.certificates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -283,6 +342,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.transfer.certificates
+SET data__PatchDocument = string('{{ {
+    "Usage": usage,
+    "ActiveDate": active_date,
+    "InactiveDate": inactive_date,
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<CertificateId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/transfer/certificates_list_only/index.md b/website/docs/services/transfer/certificates_list_only/index.md
deleted file mode 100644
index a4d7ddee7..000000000
--- a/website/docs/services/transfer/certificates_list_only/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: certificates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - certificates_list_only
-  - transfer
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>certificates</code> in a region or regions, for all properties use <a href="/services/transfer/certificates/"><code>certificates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>certificates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Transfer::Certificate</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.transfer.certificates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "certificate",
-    "type": "string",
-    "description": "Specifies the certificate body to be imported."
-  },
-  {
-    "name": "certificate_id",
-    "type": "string",
-    "description": "A unique identifier for the certificate."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>certificates</code> in a region.
-```sql
-SELECT
-region,
-certificate_id
-FROM awscc.transfer.certificates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>certificates_list_only</code> resource, see <a href="/services/transfer/certificates/#permissions"><code>certificates</code></a>
-
diff --git a/website/docs/services/transfer/connectors/index.md b/website/docs/services/transfer/connectors/index.md
index 09575f56c..d60cfa4c9 100644
--- a/website/docs/services/transfer/connectors/index.md
+++ b/website/docs/services/transfer/connectors/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>connector</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "access_role",
@@ -171,6 +180,23 @@ Creates, updates, deletes or gets a <code>connector</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "connector_id",
+    "type": "string",
+    "description": "A unique identifier for the connector."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-connector.html"><code>AWS::Transfer::Connector</code></a>.
 
@@ -180,31 +206,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AccessRole, Url, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>connectors_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>connectors</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -213,6 +245,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>connector</code>.
 ```sql
 SELECT
@@ -230,6 +271,19 @@ security_policy_name
 FROM awscc.transfer.connectors
 WHERE region = 'us-east-1' AND data__Identifier = '<ConnectorId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>connectors</code> in a region.
+```sql
+SELECT
+region,
+connector_id
+FROM awscc.transfer.connectors_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -332,6 +386,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.transfer.connectors
+SET data__PatchDocument = string('{{ {
+    "AccessRole": access_role,
+    "As2Config": as2_config,
+    "SftpConfig": sftp_config,
+    "LoggingRole": logging_role,
+    "Tags": tags,
+    "Url": url,
+    "SecurityPolicyName": security_policy_name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ConnectorId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/transfer/connectors_list_only/index.md b/website/docs/services/transfer/connectors_list_only/index.md
deleted file mode 100644
index 2729ff23e..000000000
--- a/website/docs/services/transfer/connectors_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: connectors_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - connectors_list_only
-  - transfer
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>connectors</code> in a region or regions, for all properties use <a href="/services/transfer/connectors/"><code>connectors</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>connectors_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Transfer::Connector</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.transfer.connectors_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "connector_id",
-    "type": "string",
-    "description": "A unique identifier for the connector."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>connectors</code> in a region.
-```sql
-SELECT
-region,
-connector_id
-FROM awscc.transfer.connectors_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>connectors_list_only</code> resource, see <a href="/services/transfer/connectors/#permissions"><code>connectors</code></a>
-
diff --git a/website/docs/services/transfer/index.md b/website/docs/services/transfer/index.md
index 065964f84..1711e48fc 100644
--- a/website/docs/services/transfer/index.md
+++ b/website/docs/services/transfer/index.md
@@ -20,7 +20,7 @@ The transfer service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>16</b></span><br />
+<span>total resources:&nbsp;<b>8</b></span><br />
 </div>
 </div>
 
@@ -30,22 +30,14 @@ The transfer service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/transfer/agreements/">agreements</a><br />
-<a href="/services/transfer/agreements_list_only/">agreements_list_only</a><br />
 <a href="/services/transfer/certificates/">certificates</a><br />
-<a href="/services/transfer/certificates_list_only/">certificates_list_only</a><br />
 <a href="/services/transfer/connectors/">connectors</a><br />
-<a href="/services/transfer/connectors_list_only/">connectors_list_only</a><br />
-<a href="/services/transfer/profiles/">profiles</a><br />
-<a href="/services/transfer/profiles_list_only/">profiles_list_only</a>
+<a href="/services/transfer/profiles/">profiles</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/transfer/servers/">servers</a><br />
-<a href="/services/transfer/servers_list_only/">servers_list_only</a><br />
 <a href="/services/transfer/users/">users</a><br />
-<a href="/services/transfer/users_list_only/">users_list_only</a><br />
 <a href="/services/transfer/web_apps/">web_apps</a><br />
-<a href="/services/transfer/web_apps_list_only/">web_apps_list_only</a><br />
-<a href="/services/transfer/workflows/">workflows</a><br />
-<a href="/services/transfer/workflows_list_only/">workflows_list_only</a>
+<a href="/services/transfer/workflows/">workflows</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/transfer/profiles/index.md b/website/docs/services/transfer/profiles/index.md
index d240802fe..9b6799635 100644
--- a/website/docs/services/transfer/profiles/index.md
+++ b/website/docs/services/transfer/profiles/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>profile</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "as2_id",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>profile</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "profile_id",
+    "type": "string",
+    "description": "A unique identifier for the profile"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-profile.html"><code>AWS::Transfer::Profile</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="As2Id, ProfileType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>profiles_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>profiles</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>profile</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ profile_id
 FROM awscc.transfer.profiles
 WHERE region = 'us-east-1' AND data__Identifier = '<ProfileId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>profiles</code> in a region.
+```sql
+SELECT
+region,
+profile_id
+FROM awscc.transfer.profiles_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -214,6 +268,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.transfer.profiles
+SET data__PatchDocument = string('{{ {
+    "As2Id": as2_id,
+    "Tags": tags,
+    "CertificateIds": certificate_ids
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ProfileId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/transfer/profiles_list_only/index.md b/website/docs/services/transfer/profiles_list_only/index.md
deleted file mode 100644
index be96a4ccb..000000000
--- a/website/docs/services/transfer/profiles_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: profiles_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - profiles_list_only
-  - transfer
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>profiles</code> in a region or regions, for all properties use <a href="/services/transfer/profiles/"><code>profiles</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>profiles_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Transfer::Profile</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.transfer.profiles_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "profile_id",
-    "type": "string",
-    "description": "A unique identifier for the profile"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>profiles</code> in a region.
-```sql
-SELECT
-region,
-profile_id
-FROM awscc.transfer.profiles_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>profiles_list_only</code> resource, see <a href="/services/transfer/profiles/#permissions"><code>profiles</code></a>
-
diff --git a/website/docs/services/transfer/servers/index.md b/website/docs/services/transfer/servers/index.md
index d740e6ece..bcf3900ae 100644
--- a/website/docs/services/transfer/servers/index.md
+++ b/website/docs/services/transfer/servers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>server</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -254,6 +263,23 @@ Creates, updates, deletes or gets a <code>server</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html"><code>AWS::Transfer::Server</code></a>.
 
@@ -263,31 +289,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>servers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>servers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>servers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>servers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>servers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -296,6 +328,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>server</code>.
 ```sql
 SELECT
@@ -324,6 +365,19 @@ workflow_details
 FROM awscc.transfer.servers
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>servers</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.transfer.servers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -506,6 +560,33 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.transfer.servers
+SET data__PatchDocument = string('{{ {
+    "Certificate": certificate,
+    "EndpointDetails": endpoint_details,
+    "EndpointType": endpoint_type,
+    "IdentityProviderDetails": identity_provider_details,
+    "IpAddressType": ip_address_type,
+    "LoggingRole": logging_role,
+    "PostAuthenticationLoginBanner": post_authentication_login_banner,
+    "PreAuthenticationLoginBanner": pre_authentication_login_banner,
+    "ProtocolDetails": protocol_details,
+    "Protocols": protocols,
+    "S3StorageOptions": s3_storage_options,
+    "SecurityPolicyName": security_policy_name,
+    "StructuredLogDestinations": structured_log_destinations,
+    "Tags": tags,
+    "WorkflowDetails": workflow_details
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/transfer/servers_list_only/index.md b/website/docs/services/transfer/servers_list_only/index.md
deleted file mode 100644
index 62551826c..000000000
--- a/website/docs/services/transfer/servers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: servers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - servers_list_only
-  - transfer
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>servers</code> in a region or regions, for all properties use <a href="/services/transfer/servers/"><code>servers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>servers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Transfer::Server Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.transfer.servers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>servers</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.transfer.servers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>servers_list_only</code> resource, see <a href="/services/transfer/servers/#permissions"><code>servers</code></a>
-
diff --git a/website/docs/services/transfer/users/index.md b/website/docs/services/transfer/users/index.md
index 2d2d37d28..d92f8d297 100644
--- a/website/docs/services/transfer/users/index.md
+++ b/website/docs/services/transfer/users/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>user</code> resource or lists <code>us
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -141,6 +150,23 @@ Creates, updates, deletes or gets a <code>user</code> resource or lists <code>us
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-user.html"><code>AWS::Transfer::User</code></a>.
 
@@ -150,31 +176,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>users</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Role, ServerId, UserName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>users</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>users</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>users_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>users</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -183,6 +215,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user</code>.
 ```sql
 SELECT
@@ -201,6 +242,19 @@ user_name
 FROM awscc.transfer.users
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>users</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.transfer.users_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -311,6 +365,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.transfer.users
+SET data__PatchDocument = string('{{ {
+    "HomeDirectory": home_directory,
+    "HomeDirectoryMappings": home_directory_mappings,
+    "HomeDirectoryType": home_directory_type,
+    "Policy": policy,
+    "PosixProfile": posix_profile,
+    "Role": role,
+    "SshPublicKeys": ssh_public_keys,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/transfer/users_list_only/index.md b/website/docs/services/transfer/users_list_only/index.md
deleted file mode 100644
index d037c35b2..000000000
--- a/website/docs/services/transfer/users_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: users_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - users_list_only
-  - transfer
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>users</code> in a region or regions, for all properties use <a href="/services/transfer/users/"><code>users</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>users_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Transfer::User Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.transfer.users_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>users</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.transfer.users_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>users_list_only</code> resource, see <a href="/services/transfer/users/#permissions"><code>users</code></a>
-
diff --git a/website/docs/services/transfer/web_apps/index.md b/website/docs/services/transfer/web_apps/index.md
index f8d990e37..ca0e3c7a3 100644
--- a/website/docs/services/transfer/web_apps/index.md
+++ b/website/docs/services/transfer/web_apps/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>web_app</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -126,6 +135,23 @@ Creates, updates, deletes or gets a <code>web_app</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Specifies the unique Amazon Resource Name (ARN) for the web app."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-webapp.html"><code>AWS::Transfer::WebApp</code></a>.
 
@@ -135,31 +161,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>web_apps</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IdentityProviderDetails, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>web_apps</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>web_apps</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>web_apps_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>web_apps</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -168,6 +200,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>web_app</code>.
 ```sql
 SELECT
@@ -183,6 +224,19 @@ tags
 FROM awscc.transfer.web_apps
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>web_apps</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.transfer.web_apps_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -271,6 +325,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.transfer.web_apps
+SET data__PatchDocument = string('{{ {
+    "AccessEndpoint": access_endpoint,
+    "WebAppUnits": web_app_units,
+    "WebAppCustomization": web_app_customization,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/transfer/web_apps_list_only/index.md b/website/docs/services/transfer/web_apps_list_only/index.md
deleted file mode 100644
index c2b160272..000000000
--- a/website/docs/services/transfer/web_apps_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: web_apps_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - web_apps_list_only
-  - transfer
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>web_apps</code> in a region or regions, for all properties use <a href="/services/transfer/web_apps/"><code>web_apps</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>web_apps_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Transfer::WebApp</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.transfer.web_apps_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": "Specifies the unique Amazon Resource Name (ARN) for the web app."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>web_apps</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.transfer.web_apps_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>web_apps_list_only</code> resource, see <a href="/services/transfer/web_apps/#permissions"><code>web_apps</code></a>
-
diff --git a/website/docs/services/transfer/workflows/index.md b/website/docs/services/transfer/workflows/index.md
index 7354355f8..feb93bf68 100644
--- a/website/docs/services/transfer/workflows/index.md
+++ b/website/docs/services/transfer/workflows/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>workflow</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "on_exception_steps",
@@ -245,6 +254,23 @@ Creates, updates, deletes or gets a <code>workflow</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "workflow_id",
+    "type": "string",
+    "description": "A unique identifier for the workflow."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-workflow.html"><code>AWS::Transfer::Workflow</code></a>.
 
@@ -254,31 +280,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>workflows</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Steps, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>workflows</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>workflows</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>workflows_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>workflows</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -287,6 +319,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>workflow</code>.
 ```sql
 SELECT
@@ -300,6 +341,19 @@ arn
 FROM awscc.transfer.workflows
 WHERE region = 'us-east-1' AND data__Identifier = '<WorkflowId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>workflows</code> in a region.
+```sql
+SELECT
+region,
+workflow_id
+FROM awscc.transfer.workflows_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -408,6 +462,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.transfer.workflows
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<WorkflowId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/transfer/workflows_list_only/index.md b/website/docs/services/transfer/workflows_list_only/index.md
deleted file mode 100644
index a1c8f7950..000000000
--- a/website/docs/services/transfer/workflows_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: workflows_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - workflows_list_only
-  - transfer
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>workflows</code> in a region or regions, for all properties use <a href="/services/transfer/workflows/"><code>workflows</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>workflows_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Transfer::Workflow</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.transfer.workflows_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "workflow_id",
-    "type": "string",
-    "description": "A unique identifier for the workflow."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>workflows</code> in a region.
-```sql
-SELECT
-region,
-workflow_id
-FROM awscc.transfer.workflows_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>workflows_list_only</code> resource, see <a href="/services/transfer/workflows/#permissions"><code>workflows</code></a>
-
diff --git a/website/docs/services/verifiedpermissions/identity_sources/index.md b/website/docs/services/verifiedpermissions/identity_sources/index.md
index c7637bc8d..d34a4ea79 100644
--- a/website/docs/services/verifiedpermissions/identity_sources/index.md
+++ b/website/docs/services/verifiedpermissions/identity_sources/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>identity_source</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "configuration",
@@ -87,6 +96,28 @@ Creates, updates, deletes or gets an <code>identity_source</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "identity_source_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "policy_store_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-identitysource.html"><code>AWS::VerifiedPermissions::IdentitySource</code></a>.
 
@@ -96,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>identity_sources</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Configuration, PolicyStoreId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>identity_sources</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>identity_sources</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>identity_sources_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>identity_sources</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>identity_source</code>.
 ```sql
 SELECT
@@ -141,6 +187,20 @@ principal_entity_type
 FROM awscc.verifiedpermissions.identity_sources
 WHERE region = 'us-east-1' AND data__Identifier = '<IdentitySourceId>|<PolicyStoreId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>identity_sources</code> in a region.
+```sql
+SELECT
+region,
+identity_source_id,
+policy_store_id
+FROM awscc.verifiedpermissions.identity_sources_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -211,6 +271,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.verifiedpermissions.identity_sources
+SET data__PatchDocument = string('{{ {
+    "Configuration": configuration,
+    "PrincipalEntityType": principal_entity_type
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IdentitySourceId>|<PolicyStoreId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/verifiedpermissions/identity_sources_list_only/index.md b/website/docs/services/verifiedpermissions/identity_sources_list_only/index.md
deleted file mode 100644
index 2b2a3c0ba..000000000
--- a/website/docs/services/verifiedpermissions/identity_sources_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: identity_sources_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - identity_sources_list_only
-  - verifiedpermissions
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>identity_sources</code> in a region or regions, for all properties use <a href="/services/verifiedpermissions/identity_sources/"><code>identity_sources</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>identity_sources_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::VerifiedPermissions::IdentitySource Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.verifiedpermissions.identity_sources_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "identity_source_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "policy_store_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>identity_sources</code> in a region.
-```sql
-SELECT
-region,
-identity_source_id,
-policy_store_id
-FROM awscc.verifiedpermissions.identity_sources_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>identity_sources_list_only</code> resource, see <a href="/services/verifiedpermissions/identity_sources/#permissions"><code>identity_sources</code></a>
-
diff --git a/website/docs/services/verifiedpermissions/index.md b/website/docs/services/verifiedpermissions/index.md
index cd1b8039d..94d439069 100644
--- a/website/docs/services/verifiedpermissions/index.md
+++ b/website/docs/services/verifiedpermissions/index.md
@@ -20,7 +20,7 @@ The verifiedpermissions service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The verifiedpermissions service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/verifiedpermissions/identity_sources/">identity_sources</a><br />
-<a href="/services/verifiedpermissions/identity_sources_list_only/">identity_sources_list_only</a><br />
-<a href="/services/verifiedpermissions/policies/">policies</a><br />
-<a href="/services/verifiedpermissions/policies_list_only/">policies_list_only</a>
+<a href="/services/verifiedpermissions/policies/">policies</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/verifiedpermissions/policy_stores/">policy_stores</a><br />
-<a href="/services/verifiedpermissions/policy_stores_list_only/">policy_stores_list_only</a><br />
-<a href="/services/verifiedpermissions/policy_templates/">policy_templates</a><br />
-<a href="/services/verifiedpermissions/policy_templates_list_only/">policy_templates_list_only</a>
+<a href="/services/verifiedpermissions/policy_templates/">policy_templates</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/verifiedpermissions/policies/index.md b/website/docs/services/verifiedpermissions/policies/index.md
index 5ab5e810a..f61a1e7ae 100644
--- a/website/docs/services/verifiedpermissions/policies/index.md
+++ b/website/docs/services/verifiedpermissions/policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>policy</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "definition",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets a <code>policy</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "policy_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "policy_store_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-policy.html"><code>AWS::VerifiedPermissions::Policy</code></a>.
 
@@ -69,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Definition, PolicyStoreId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>policy</code>.
 ```sql
 SELECT
@@ -113,6 +159,20 @@ policy_type
 FROM awscc.verifiedpermissions.policies
 WHERE region = 'us-east-1' AND data__Identifier = '<PolicyId>|<PolicyStoreId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>policies</code> in a region.
+```sql
+SELECT
+region,
+policy_id,
+policy_store_id
+FROM awscc.verifiedpermissions.policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -179,6 +239,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.verifiedpermissions.policies
+SET data__PatchDocument = string('{{ {
+    "Definition": definition
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PolicyId>|<PolicyStoreId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/verifiedpermissions/policies_list_only/index.md b/website/docs/services/verifiedpermissions/policies_list_only/index.md
deleted file mode 100644
index d562dd9c0..000000000
--- a/website/docs/services/verifiedpermissions/policies_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - policies_list_only
-  - verifiedpermissions
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>policies</code> in a region or regions, for all properties use <a href="/services/verifiedpermissions/policies/"><code>policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::VerifiedPermissions::Policy Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.verifiedpermissions.policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "policy_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "policy_store_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>policies</code> in a region.
-```sql
-SELECT
-region,
-policy_id,
-policy_store_id
-FROM awscc.verifiedpermissions.policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>policies_list_only</code> resource, see <a href="/services/verifiedpermissions/policies/#permissions"><code>policies</code></a>
-
diff --git a/website/docs/services/verifiedpermissions/policy_stores/index.md b/website/docs/services/verifiedpermissions/policy_stores/index.md
index 6e796ffad..b7492299b 100644
--- a/website/docs/services/verifiedpermissions/policy_stores/index.md
+++ b/website/docs/services/verifiedpermissions/policy_stores/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>policy_store</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -101,6 +110,23 @@ Creates, updates, deletes or gets a <code>policy_store</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "policy_store_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-policystore.html"><code>AWS::VerifiedPermissions::PolicyStore</code></a>.
 
@@ -110,31 +136,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>policy_stores</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ValidationSettings, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>policy_stores</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>policy_stores</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>policy_stores_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>policy_stores</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -143,6 +175,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>policy_store</code>.
 ```sql
 SELECT
@@ -157,6 +198,19 @@ tags
 FROM awscc.verifiedpermissions.policy_stores
 WHERE region = 'us-east-1' AND data__Identifier = '<PolicyStoreId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>policy_stores</code> in a region.
+```sql
+SELECT
+region,
+policy_store_id
+FROM awscc.verifiedpermissions.policy_stores_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -237,6 +291,23 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.verifiedpermissions.policy_stores
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "ValidationSettings": validation_settings,
+    "Schema": schema,
+    "DeletionProtection": deletion_protection,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PolicyStoreId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/verifiedpermissions/policy_stores_list_only/index.md b/website/docs/services/verifiedpermissions/policy_stores_list_only/index.md
deleted file mode 100644
index f2db4b51b..000000000
--- a/website/docs/services/verifiedpermissions/policy_stores_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: policy_stores_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - policy_stores_list_only
-  - verifiedpermissions
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>policy_stores</code> in a region or regions, for all properties use <a href="/services/verifiedpermissions/policy_stores/"><code>policy_stores</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>policy_stores_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Represents a policy store that you can place schema, policies, and policy templates in to validate authorization requests</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.verifiedpermissions.policy_stores_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "policy_store_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>policy_stores</code> in a region.
-```sql
-SELECT
-region,
-policy_store_id
-FROM awscc.verifiedpermissions.policy_stores_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>policy_stores_list_only</code> resource, see <a href="/services/verifiedpermissions/policy_stores/#permissions"><code>policy_stores</code></a>
-
diff --git a/website/docs/services/verifiedpermissions/policy_templates/index.md b/website/docs/services/verifiedpermissions/policy_templates/index.md
index 2513a9b60..4f2f7814c 100644
--- a/website/docs/services/verifiedpermissions/policy_templates/index.md
+++ b/website/docs/services/verifiedpermissions/policy_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>policy_template</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -60,6 +69,28 @@ Creates, updates, deletes or gets a <code>policy_template</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "policy_store_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "policy_template_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-policytemplate.html"><code>AWS::VerifiedPermissions::PolicyTemplate</code></a>.
 
@@ -69,31 +100,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>policy_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Statement, PolicyStoreId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>policy_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>policy_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>policy_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>policy_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +139,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>policy_template</code>.
 ```sql
 SELECT
@@ -113,6 +159,20 @@ statement
 FROM awscc.verifiedpermissions.policy_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<PolicyStoreId>|<PolicyTemplateId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>policy_templates</code> in a region.
+```sql
+SELECT
+region,
+policy_store_id,
+policy_template_id
+FROM awscc.verifiedpermissions.policy_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -183,6 +243,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.verifiedpermissions.policy_templates
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Statement": statement
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PolicyStoreId>|<PolicyTemplateId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/verifiedpermissions/policy_templates_list_only/index.md b/website/docs/services/verifiedpermissions/policy_templates_list_only/index.md
deleted file mode 100644
index cc4f5ca0d..000000000
--- a/website/docs/services/verifiedpermissions/policy_templates_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: policy_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - policy_templates_list_only
-  - verifiedpermissions
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>policy_templates</code> in a region or regions, for all properties use <a href="/services/verifiedpermissions/policy_templates/"><code>policy_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>policy_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::VerifiedPermissions::PolicyTemplate Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.verifiedpermissions.policy_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "policy_store_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "policy_template_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>policy_templates</code> in a region.
-```sql
-SELECT
-region,
-policy_store_id,
-policy_template_id
-FROM awscc.verifiedpermissions.policy_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>policy_templates_list_only</code> resource, see <a href="/services/verifiedpermissions/policy_templates/#permissions"><code>policy_templates</code></a>
-
diff --git a/website/docs/services/voiceid/domains/index.md b/website/docs/services/voiceid/domains/index.md
index 59a1ddd62..cde50ee36 100644
--- a/website/docs/services/voiceid/domains/index.md
+++ b/website/docs/services/voiceid/domains/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>domain</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -84,6 +93,23 @@ Creates, updates, deletes or gets a <code>domain</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-voiceid-domain.html"><code>AWS::VoiceID::Domain</code></a>.
 
@@ -93,31 +119,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, ServerSideEncryptionConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>domains_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>domains</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -126,6 +158,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>domain</code>.
 ```sql
 SELECT
@@ -138,6 +179,19 @@ tags
 FROM awscc.voiceid.domains
 WHERE region = 'us-east-1' AND data__Identifier = '<DomainId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>domains</code> in a region.
+```sql
+SELECT
+region,
+domain_id
+FROM awscc.voiceid.domains_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -215,6 +269,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.voiceid.domains
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "Name": name,
+    "ServerSideEncryptionConfiguration": server_side_encryption_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DomainId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/voiceid/domains_list_only/index.md b/website/docs/services/voiceid/domains_list_only/index.md
deleted file mode 100644
index c1353c712..000000000
--- a/website/docs/services/voiceid/domains_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: domains_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - domains_list_only
-  - voiceid
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>domains</code> in a region or regions, for all properties use <a href="/services/voiceid/domains/"><code>domains</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>domains_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>The AWS::VoiceID::Domain resource specifies an Amazon VoiceID Domain.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.voiceid.domains_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "domain_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>domains</code> in a region.
-```sql
-SELECT
-region,
-domain_id
-FROM awscc.voiceid.domains_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>domains_list_only</code> resource, see <a href="/services/voiceid/domains/#permissions"><code>domains</code></a>
-
diff --git a/website/docs/services/voiceid/index.md b/website/docs/services/voiceid/index.md
index 76423706c..06477d676 100644
--- a/website/docs/services/voiceid/index.md
+++ b/website/docs/services/voiceid/index.md
@@ -20,7 +20,7 @@ The voiceid service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The voiceid service documentation.
 <a href="/services/voiceid/domains/">domains</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/voiceid/domains_list_only/">domains_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/vpclattice/access_log_subscriptions/index.md b/website/docs/services/vpclattice/access_log_subscriptions/index.md
index bc2960157..54cc49763 100644
--- a/website/docs/services/vpclattice/access_log_subscriptions/index.md
+++ b/website/docs/services/vpclattice/access_log_subscriptions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>access_log_subscription</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -92,6 +101,23 @@ Creates, updates, deletes or gets an <code>access_log_subscription</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-accesslogsubscription.html"><code>AWS::VpcLattice::AccessLogSubscription</code></a>.
 
@@ -101,31 +127,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>access_log_subscriptions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DestinationArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>access_log_subscriptions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>access_log_subscriptions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>access_log_subscriptions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>access_log_subscriptions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +166,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>access_log_subscription</code>.
 ```sql
 SELECT
@@ -149,6 +190,19 @@ tags
 FROM awscc.vpclattice.access_log_subscriptions
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>access_log_subscriptions</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.vpclattice.access_log_subscriptions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -223,6 +277,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.vpclattice.access_log_subscriptions
+SET data__PatchDocument = string('{{ {
+    "DestinationArn": destination_arn,
+    "ServiceNetworkLogType": service_network_log_type,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/vpclattice/access_log_subscriptions_list_only/index.md b/website/docs/services/vpclattice/access_log_subscriptions_list_only/index.md
deleted file mode 100644
index bc9c583f6..000000000
--- a/website/docs/services/vpclattice/access_log_subscriptions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: access_log_subscriptions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - access_log_subscriptions_list_only
-  - vpclattice
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>access_log_subscriptions</code> in a region or regions, for all properties use <a href="/services/vpclattice/access_log_subscriptions/"><code>access_log_subscriptions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>access_log_subscriptions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Enables access logs to be sent to Amazon CloudWatch, Amazon S3, and Amazon Kinesis Data Firehose. The service network owner can use the access logs to audit the services in the network. The service network owner will only see access logs from clients and services that are associated with their service network. Access log entries represent traffic originated from VPCs associated with that network.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.vpclattice.access_log_subscriptions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>access_log_subscriptions</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.vpclattice.access_log_subscriptions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>access_log_subscriptions_list_only</code> resource, see <a href="/services/vpclattice/access_log_subscriptions/#permissions"><code>access_log_subscriptions</code></a>
-
diff --git a/website/docs/services/vpclattice/auth_policies/index.md b/website/docs/services/vpclattice/auth_policies/index.md
index 64266b56e..de68f4ab2 100644
--- a/website/docs/services/vpclattice/auth_policies/index.md
+++ b/website/docs/services/vpclattice/auth_policies/index.md
@@ -168,6 +168,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.vpclattice.auth_policies
+SET data__PatchDocument = string('{{ {
+    "Policy": policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ResourceIdentifier>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/vpclattice/index.md b/website/docs/services/vpclattice/index.md
index bed09308a..1abb40732 100644
--- a/website/docs/services/vpclattice/index.md
+++ b/website/docs/services/vpclattice/index.md
@@ -20,7 +20,7 @@ The vpclattice service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>24</b></span><br />
+<span>total resources:&nbsp;<b>13</b></span><br />
 </div>
 </div>
 
@@ -30,30 +30,19 @@ The vpclattice service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/vpclattice/access_log_subscriptions/">access_log_subscriptions</a><br />
-<a href="/services/vpclattice/access_log_subscriptions_list_only/">access_log_subscriptions_list_only</a><br />
 <a href="/services/vpclattice/auth_policies/">auth_policies</a><br />
 <a href="/services/vpclattice/listeners/">listeners</a><br />
-<a href="/services/vpclattice/listeners_list_only/">listeners_list_only</a><br />
 <a href="/services/vpclattice/resource_configurations/">resource_configurations</a><br />
-<a href="/services/vpclattice/resource_configurations_list_only/">resource_configurations_list_only</a><br />
 <a href="/services/vpclattice/resource_gateways/">resource_gateways</a><br />
-<a href="/services/vpclattice/resource_gateways_list_only/">resource_gateways_list_only</a><br />
 <a href="/services/vpclattice/resource_policies/">resource_policies</a><br />
-<a href="/services/vpclattice/rules/">rules</a><br />
-<a href="/services/vpclattice/rules_list_only/">rules_list_only</a>
+<a href="/services/vpclattice/rules/">rules</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/vpclattice/service_network_resource_associations/">service_network_resource_associations</a><br />
-<a href="/services/vpclattice/service_network_resource_associations_list_only/">service_network_resource_associations_list_only</a><br />
 <a href="/services/vpclattice/service_network_service_associations/">service_network_service_associations</a><br />
-<a href="/services/vpclattice/service_network_service_associations_list_only/">service_network_service_associations_list_only</a><br />
 <a href="/services/vpclattice/service_network_vpc_associations/">service_network_vpc_associations</a><br />
-<a href="/services/vpclattice/service_network_vpc_associations_list_only/">service_network_vpc_associations_list_only</a><br />
 <a href="/services/vpclattice/service_networks/">service_networks</a><br />
-<a href="/services/vpclattice/service_networks_list_only/">service_networks_list_only</a><br />
 <a href="/services/vpclattice/services/">services</a><br />
-<a href="/services/vpclattice/services_list_only/">services_list_only</a><br />
-<a href="/services/vpclattice/target_groups/">target_groups</a><br />
-<a href="/services/vpclattice/target_groups_list_only/">target_groups_list_only</a>
+<a href="/services/vpclattice/target_groups/">target_groups</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/vpclattice/listeners/index.md b/website/docs/services/vpclattice/listeners/index.md
index 1d3cd7428..5b0052e18 100644
--- a/website/docs/services/vpclattice/listeners/index.md
+++ b/website/docs/services/vpclattice/listeners/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>listener</code> resource or lists <cod
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -140,6 +149,23 @@ Creates, updates, deletes or gets a <code>listener</code> resource or lists <cod
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-listener.html"><code>AWS::VpcLattice::Listener</code></a>.
 
@@ -149,31 +175,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>listeners</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DefaultAction, Protocol, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>listeners</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>listeners</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>listeners_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>listeners</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -182,6 +214,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>listener</code>.
 ```sql
 SELECT
@@ -199,6 +240,19 @@ tags
 FROM awscc.vpclattice.listeners
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>listeners</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.vpclattice.listeners_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -289,6 +343,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.vpclattice.listeners
+SET data__PatchDocument = string('{{ {
+    "DefaultAction": default_action,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/vpclattice/listeners_list_only/index.md b/website/docs/services/vpclattice/listeners_list_only/index.md
deleted file mode 100644
index 8944531f2..000000000
--- a/website/docs/services/vpclattice/listeners_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: listeners_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - listeners_list_only
-  - vpclattice
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>listeners</code> in a region or regions, for all properties use <a href="/services/vpclattice/listeners/"><code>listeners</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>listeners_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a listener for a service. Before you start using your Amazon VPC Lattice service, you must add one or more listeners. A listener is a process that checks for connection requests to your services.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.vpclattice.listeners_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>listeners</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.vpclattice.listeners_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>listeners_list_only</code> resource, see <a href="/services/vpclattice/listeners/#permissions"><code>listeners</code></a>
-
diff --git a/website/docs/services/vpclattice/resource_configurations/index.md b/website/docs/services/vpclattice/resource_configurations/index.md
index 852258d85..41943cadf 100644
--- a/website/docs/services/vpclattice/resource_configurations/index.md
+++ b/website/docs/services/vpclattice/resource_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_configuration</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "allow_association_to_sharable_service_network",
@@ -107,6 +116,23 @@ Creates, updates, deletes or gets a <code>resource_configuration</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-resourceconfiguration.html"><code>AWS::VpcLattice::ResourceConfiguration</code></a>.
 
@@ -116,31 +142,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, ResourceConfigurationType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -149,6 +181,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_configuration</code>.
 ```sql
 SELECT
@@ -168,6 +209,19 @@ name
 FROM awscc.vpclattice.resource_configurations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_configurations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.vpclattice.resource_configurations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -269,6 +323,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.vpclattice.resource_configurations
+SET data__PatchDocument = string('{{ {
+    "AllowAssociationToSharableServiceNetwork": allow_association_to_sharable_service_network,
+    "PortRanges": port_ranges,
+    "ResourceConfigurationDefinition": resource_configuration_definition,
+    "ResourceConfigurationGroupId": resource_configuration_group_id,
+    "Tags": tags,
+    "Name": name
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/vpclattice/resource_configurations_list_only/index.md b/website/docs/services/vpclattice/resource_configurations_list_only/index.md
deleted file mode 100644
index a183ee7d3..000000000
--- a/website/docs/services/vpclattice/resource_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_configurations_list_only
-  - vpclattice
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_configurations</code> in a region or regions, for all properties use <a href="/services/vpclattice/resource_configurations/"><code>resource_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>VpcLattice ResourceConfiguration CFN resource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.vpclattice.resource_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_configurations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.vpclattice.resource_configurations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_configurations_list_only</code> resource, see <a href="/services/vpclattice/resource_configurations/#permissions"><code>resource_configurations</code></a>
-
diff --git a/website/docs/services/vpclattice/resource_gateways/index.md b/website/docs/services/vpclattice/resource_gateways/index.md
index 358c39a92..3777a3f83 100644
--- a/website/docs/services/vpclattice/resource_gateways/index.md
+++ b/website/docs/services/vpclattice/resource_gateways/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_gateway</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "ip_address_type",
@@ -97,6 +106,23 @@ Creates, updates, deletes or gets a <code>resource_gateway</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-resourcegateway.html"><code>AWS::VpcLattice::ResourceGateway</code></a>.
 
@@ -106,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_gateways</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, VpcIdentifier, SubnetIds, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_gateways</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_gateways</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_gateways_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_gateways</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -139,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_gateway</code>.
 ```sql
 SELECT
@@ -155,6 +196,19 @@ name
 FROM awscc.vpclattice.resource_gateways
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_gateways</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.vpclattice.resource_gateways_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -247,6 +301,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.vpclattice.resource_gateways
+SET data__PatchDocument = string('{{ {
+    "Ipv4AddressesPerEni": ipv4_addresses_per_eni,
+    "SecurityGroupIds": security_group_ids,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/vpclattice/resource_gateways_list_only/index.md b/website/docs/services/vpclattice/resource_gateways_list_only/index.md
deleted file mode 100644
index 603439cf4..000000000
--- a/website/docs/services/vpclattice/resource_gateways_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_gateways_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_gateways_list_only
-  - vpclattice
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_gateways</code> in a region or regions, for all properties use <a href="/services/vpclattice/resource_gateways/"><code>resource_gateways</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_gateways_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a resource gateway for a service.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.vpclattice.resource_gateways_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_gateways</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.vpclattice.resource_gateways_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_gateways_list_only</code> resource, see <a href="/services/vpclattice/resource_gateways/#permissions"><code>resource_gateways</code></a>
-
diff --git a/website/docs/services/vpclattice/resource_policies/index.md b/website/docs/services/vpclattice/resource_policies/index.md
index 18e98552d..559e063ee 100644
--- a/website/docs/services/vpclattice/resource_policies/index.md
+++ b/website/docs/services/vpclattice/resource_policies/index.md
@@ -162,6 +162,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.vpclattice.resource_policies
+SET data__PatchDocument = string('{{ {
+    "Policy": policy
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ResourceArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/vpclattice/rules/index.md b/website/docs/services/vpclattice/rules/index.md
index 76fc344cd..d0c37c29c 100644
--- a/website/docs/services/vpclattice/rules/index.md
+++ b/website/docs/services/vpclattice/rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>rule</code> resource or lists <code>ru
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "action",
@@ -188,6 +197,23 @@ Creates, updates, deletes or gets a <code>rule</code> resource or lists <code>ru
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-rule.html"><code>AWS::VpcLattice::Rule</code></a>.
 
@@ -197,31 +223,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Action, Match, Priority, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -230,6 +262,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>rule</code>.
 ```sql
 SELECT
@@ -246,6 +287,19 @@ tags
 FROM awscc.vpclattice.rules
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>rules</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.vpclattice.rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -356,6 +410,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.vpclattice.rules
+SET data__PatchDocument = string('{{ {
+    "Action": action,
+    "Match": match,
+    "Priority": priority,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/vpclattice/rules_list_only/index.md b/website/docs/services/vpclattice/rules_list_only/index.md
deleted file mode 100644
index 993ec7641..000000000
--- a/website/docs/services/vpclattice/rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - rules_list_only
-  - vpclattice
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>rules</code> in a region or regions, for all properties use <a href="/services/vpclattice/rules/"><code>rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Creates a listener rule. Each listener has a default rule for checking connection requests, but you can define additional rules. Each rule consists of a priority, one or more actions, and one or more conditions.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.vpclattice.rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>rules</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.vpclattice.rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>rules_list_only</code> resource, see <a href="/services/vpclattice/rules/#permissions"><code>rules</code></a>
-
diff --git a/website/docs/services/vpclattice/service_network_resource_associations/index.md b/website/docs/services/vpclattice/service_network_resource_associations/index.md
index db598277f..d1f5616c3 100644
--- a/website/docs/services/vpclattice/service_network_resource_associations/index.md
+++ b/website/docs/services/vpclattice/service_network_resource_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>service_network_resource_association</
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -77,6 +86,23 @@ Creates, updates, deletes or gets a <code>service_network_resource_association</
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-servicenetworkresourceassociation.html"><code>AWS::VpcLattice::ServiceNetworkResourceAssociation</code></a>.
 
@@ -86,31 +112,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>service_network_resource_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>service_network_resource_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>service_network_resource_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>service_network_resource_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>service_network_resource_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -119,6 +151,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>service_network_resource_association</code>.
 ```sql
 SELECT
@@ -131,6 +172,19 @@ tags
 FROM awscc.vpclattice.service_network_resource_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>service_network_resource_associations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.vpclattice.service_network_resource_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -205,6 +259,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.vpclattice.service_network_resource_associations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/vpclattice/service_network_resource_associations_list_only/index.md b/website/docs/services/vpclattice/service_network_resource_associations_list_only/index.md
deleted file mode 100644
index 1dafaacd3..000000000
--- a/website/docs/services/vpclattice/service_network_resource_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: service_network_resource_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - service_network_resource_associations_list_only
-  - vpclattice
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>service_network_resource_associations</code> in a region or regions, for all properties use <a href="/services/vpclattice/service_network_resource_associations/"><code>service_network_resource_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>service_network_resource_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>VpcLattice ServiceNetworkResourceAssociation CFN resource</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.vpclattice.service_network_resource_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>service_network_resource_associations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.vpclattice.service_network_resource_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>service_network_resource_associations_list_only</code> resource, see <a href="/services/vpclattice/service_network_resource_associations/#permissions"><code>service_network_resource_associations</code></a>
-
diff --git a/website/docs/services/vpclattice/service_network_service_associations/index.md b/website/docs/services/vpclattice/service_network_service_associations/index.md
index 33f92704c..f3805b4ee 100644
--- a/website/docs/services/vpclattice/service_network_service_associations/index.md
+++ b/website/docs/services/vpclattice/service_network_service_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>service_network_service_association</c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -134,6 +143,23 @@ Creates, updates, deletes or gets a <code>service_network_service_association</c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-servicenetworkserviceassociation.html"><code>AWS::VpcLattice::ServiceNetworkServiceAssociation</code></a>.
 
@@ -143,31 +169,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>service_network_service_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>service_network_service_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>service_network_service_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>service_network_service_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>service_network_service_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -176,6 +208,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>service_network_service_association</code>.
 ```sql
 SELECT
@@ -197,6 +238,19 @@ tags
 FROM awscc.vpclattice.service_network_service_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>service_network_service_associations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.vpclattice.service_network_service_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -279,6 +333,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.vpclattice.service_network_service_associations
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/vpclattice/service_network_service_associations_list_only/index.md b/website/docs/services/vpclattice/service_network_service_associations_list_only/index.md
deleted file mode 100644
index c94c120d0..000000000
--- a/website/docs/services/vpclattice/service_network_service_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: service_network_service_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - service_network_service_associations_list_only
-  - vpclattice
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>service_network_service_associations</code> in a region or regions, for all properties use <a href="/services/vpclattice/service_network_service_associations/"><code>service_network_service_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>service_network_service_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Associates a service with a service network.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.vpclattice.service_network_service_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>service_network_service_associations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.vpclattice.service_network_service_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>service_network_service_associations_list_only</code> resource, see <a href="/services/vpclattice/service_network_service_associations/#permissions"><code>service_network_service_associations</code></a>
-
diff --git a/website/docs/services/vpclattice/service_network_vpc_associations/index.md b/website/docs/services/vpclattice/service_network_vpc_associations/index.md
index 5b188e3a8..ebe47fe04 100644
--- a/website/docs/services/vpclattice/service_network_vpc_associations/index.md
+++ b/website/docs/services/vpclattice/service_network_vpc_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>service_network_vpc_association</code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -112,6 +121,23 @@ Creates, updates, deletes or gets a <code>service_network_vpc_association</code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-servicenetworkvpcassociation.html"><code>AWS::VpcLattice::ServiceNetworkVpcAssociation</code></a>.
 
@@ -121,31 +147,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>service_network_vpc_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>service_network_vpc_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>service_network_vpc_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>service_network_vpc_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>service_network_vpc_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -154,6 +186,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>service_network_vpc_association</code>.
 ```sql
 SELECT
@@ -173,6 +214,19 @@ tags
 FROM awscc.vpclattice.service_network_vpc_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>service_network_vpc_associations</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.vpclattice.service_network_vpc_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -254,6 +308,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.vpclattice.service_network_vpc_associations
+SET data__PatchDocument = string('{{ {
+    "SecurityGroupIds": security_group_ids,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/vpclattice/service_network_vpc_associations_list_only/index.md b/website/docs/services/vpclattice/service_network_vpc_associations_list_only/index.md
deleted file mode 100644
index ac1370817..000000000
--- a/website/docs/services/vpclattice/service_network_vpc_associations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: service_network_vpc_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - service_network_vpc_associations_list_only
-  - vpclattice
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>service_network_vpc_associations</code> in a region or regions, for all properties use <a href="/services/vpclattice/service_network_vpc_associations/"><code>service_network_vpc_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>service_network_vpc_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Associates a VPC with a service network.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.vpclattice.service_network_vpc_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>service_network_vpc_associations</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.vpclattice.service_network_vpc_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>service_network_vpc_associations_list_only</code> resource, see <a href="/services/vpclattice/service_network_vpc_associations/#permissions"><code>service_network_vpc_associations</code></a>
-
diff --git a/website/docs/services/vpclattice/service_networks/index.md b/website/docs/services/vpclattice/service_networks/index.md
index 9f2aa2feb..17d15c29e 100644
--- a/website/docs/services/vpclattice/service_networks/index.md
+++ b/website/docs/services/vpclattice/service_networks/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>service_network</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -99,6 +108,23 @@ Creates, updates, deletes or gets a <code>service_network</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-servicenetwork.html"><code>AWS::VpcLattice::ServiceNetwork</code></a>.
 
@@ -108,31 +134,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>service_networks</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>service_networks</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>service_networks</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>service_networks_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>service_networks</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -141,6 +173,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>service_network</code>.
 ```sql
 SELECT
@@ -156,6 +197,19 @@ sharing_config
 FROM awscc.vpclattice.service_networks
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>service_networks</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.vpclattice.service_networks_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -237,6 +291,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.vpclattice.service_networks
+SET data__PatchDocument = string('{{ {
+    "AuthType": auth_type,
+    "Tags": tags,
+    "SharingConfig": sharing_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/vpclattice/service_networks_list_only/index.md b/website/docs/services/vpclattice/service_networks_list_only/index.md
deleted file mode 100644
index 3990823e9..000000000
--- a/website/docs/services/vpclattice/service_networks_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: service_networks_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - service_networks_list_only
-  - vpclattice
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>service_networks</code> in a region or regions, for all properties use <a href="/services/vpclattice/service_networks/"><code>service_networks</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>service_networks_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A service network is a logical boundary for a collection of services. You can associate services and VPCs with a service network.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.vpclattice.service_networks_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>service_networks</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.vpclattice.service_networks_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>service_networks_list_only</code> resource, see <a href="/services/vpclattice/service_networks/#permissions"><code>service_networks</code></a>
-
diff --git a/website/docs/services/vpclattice/services/index.md b/website/docs/services/vpclattice/services/index.md
index 0b1a6aa26..667b81950 100644
--- a/website/docs/services/vpclattice/services/index.md
+++ b/website/docs/services/vpclattice/services/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>service</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -119,6 +128,23 @@ Creates, updates, deletes or gets a <code>service</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-service.html"><code>AWS::VpcLattice::Service</code></a>.
 
@@ -128,31 +154,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>services</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>services</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>services</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>services_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>services</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -161,6 +193,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>service</code>.
 ```sql
 SELECT
@@ -179,6 +220,19 @@ tags
 FROM awscc.vpclattice.services
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>services</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.vpclattice.services_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -273,6 +327,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.vpclattice.services
+SET data__PatchDocument = string('{{ {
+    "AuthType": auth_type,
+    "CertificateArn": certificate_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/vpclattice/services_list_only/index.md b/website/docs/services/vpclattice/services_list_only/index.md
deleted file mode 100644
index 4e41e1209..000000000
--- a/website/docs/services/vpclattice/services_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: services_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - services_list_only
-  - vpclattice
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>services</code> in a region or regions, for all properties use <a href="/services/vpclattice/services/"><code>services</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>services_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A service is any software application that can run on instances containers, or serverless functions within an account or virtual private cloud (VPC).</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.vpclattice.services_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>services</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.vpclattice.services_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>services_list_only</code> resource, see <a href="/services/vpclattice/services/#permissions"><code>services</code></a>
-
diff --git a/website/docs/services/vpclattice/target_groups/index.md b/website/docs/services/vpclattice/target_groups/index.md
index 93a76e2b5..697e57bd5 100644
--- a/website/docs/services/vpclattice/target_groups/index.md
+++ b/website/docs/services/vpclattice/target_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>target_group</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -210,6 +219,23 @@ Creates, updates, deletes or gets a <code>target_group</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-vpclattice-targetgroup.html"><code>AWS::VpcLattice::TargetGroup</code></a>.
 
@@ -219,31 +245,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>target_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>target_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>target_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>target_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>target_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -252,6 +284,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>target_group</code>.
 ```sql
 SELECT
@@ -269,6 +310,19 @@ tags
 FROM awscc.vpclattice.target_groups
 WHERE region = 'us-east-1' AND data__Identifier = '<Arn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>target_groups</code> in a region.
+```sql
+SELECT
+region,
+arn
+FROM awscc.vpclattice.target_groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -367,6 +421,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.vpclattice.target_groups
+SET data__PatchDocument = string('{{ {
+    "Targets": targets,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Arn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/vpclattice/target_groups_list_only/index.md b/website/docs/services/vpclattice/target_groups_list_only/index.md
deleted file mode 100644
index 8782c70c4..000000000
--- a/website/docs/services/vpclattice/target_groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: target_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - target_groups_list_only
-  - vpclattice
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>target_groups</code> in a region or regions, for all properties use <a href="/services/vpclattice/target_groups/"><code>target_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>target_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A target group is a collection of targets, or compute resources, that run your application or service. A target group can only be used by a single service.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.vpclattice.target_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>target_groups</code> in a region.
-```sql
-SELECT
-region,
-arn
-FROM awscc.vpclattice.target_groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>target_groups_list_only</code> resource, see <a href="/services/vpclattice/target_groups/#permissions"><code>target_groups</code></a>
-
diff --git a/website/docs/services/wafv2/index.md b/website/docs/services/wafv2/index.md
index e98bfcf0f..64d650a50 100644
--- a/website/docs/services/wafv2/index.md
+++ b/website/docs/services/wafv2/index.md
@@ -20,7 +20,7 @@ The wafv2 service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>11</b></span><br />
+<span>total resources:&nbsp;<b>6</b></span><br />
 </div>
 </div>
 
@@ -30,17 +30,12 @@ The wafv2 service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/wafv2/ip_sets/">ip_sets</a><br />
-<a href="/services/wafv2/ip_sets_list_only/">ip_sets_list_only</a><br />
 <a href="/services/wafv2/logging_configurations/">logging_configurations</a><br />
-<a href="/services/wafv2/logging_configurations_list_only/">logging_configurations_list_only</a><br />
-<a href="/services/wafv2/regex_pattern_sets/">regex_pattern_sets</a><br />
-<a href="/services/wafv2/regex_pattern_sets_list_only/">regex_pattern_sets_list_only</a>
+<a href="/services/wafv2/regex_pattern_sets/">regex_pattern_sets</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/wafv2/rule_groups/">rule_groups</a><br />
-<a href="/services/wafv2/rule_groups_list_only/">rule_groups_list_only</a><br />
 <a href="/services/wafv2/web_acls/">web_acls</a><br />
-<a href="/services/wafv2/web_acls_list_only/">web_acls_list_only</a><br />
 <a href="/services/wafv2/webacl_associations/">webacl_associations</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/wafv2/ip_sets/index.md b/website/docs/services/wafv2/ip_sets/index.md
index 958f3e37d..6cad96db5 100644
--- a/website/docs/services/wafv2/ip_sets/index.md
+++ b/website/docs/services/wafv2/ip_sets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ip_set</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -92,6 +101,33 @@ Creates, updates, deletes or gets an <code>ip_set</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Name of the WebACL."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Id of the WebACL"
+  },
+  {
+    "name": "scope",
+    "type": "string",
+    "description": "Use CLOUDFRONT for CloudFront WebACL, use REGIONAL for Application Load Balancer and API Gateway."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-ipset.html"><code>AWS::WAFv2::IPSet</code></a>.
 
@@ -101,31 +137,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ip_sets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Addresses, IPAddressVersion, Scope, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ip_sets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ip_sets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ip_sets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ip_sets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -134,6 +176,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ip_set</code>.
 ```sql
 SELECT
@@ -149,6 +200,21 @@ tags
 FROM awscc.wafv2.ip_sets
 WHERE data__Identifier = '<Name>|<Id>|<Scope>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ip_sets</code> in a region.
+```sql
+SELECT
+region,
+name,
+id,
+scope
+FROM awscc.wafv2.ip_sets_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -236,6 +302,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.wafv2.ip_sets
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "IPAddressVersion": ip_address_version,
+    "Addresses": addresses,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>|<Id>|<Scope>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wafv2/ip_sets_list_only/index.md b/website/docs/services/wafv2/ip_sets_list_only/index.md
deleted file mode 100644
index 5eb1f0523..000000000
--- a/website/docs/services/wafv2/ip_sets_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: ip_sets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ip_sets_list_only
-  - wafv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ip_sets</code> in a region or regions, for all properties use <a href="/services/wafv2/ip_sets/"><code>ip_sets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ip_sets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Contains a list of IP addresses. This can be either IPV4 or IPV6. The list will be mutually</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wafv2.ip_sets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Name of the WebACL."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Id of the WebACL"
-  },
-  {
-    "name": "scope",
-    "type": "string",
-    "description": "Use CLOUDFRONT for CloudFront WebACL, use REGIONAL for Application Load Balancer and API Gateway."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ip_sets</code> in a region.
-```sql
-SELECT
-region,
-name,
-id,
-scope
-FROM awscc.wafv2.ip_sets_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ip_sets_list_only</code> resource, see <a href="/services/wafv2/ip_sets/#permissions"><code>ip_sets</code></a>
-
diff --git a/website/docs/services/wafv2/logging_configurations/index.md b/website/docs/services/wafv2/logging_configurations/index.md
index 922be4c9d..5b764c959 100644
--- a/website/docs/services/wafv2/logging_configurations/index.md
+++ b/website/docs/services/wafv2/logging_configurations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>logging_configuration</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "resource_arn",
@@ -317,6 +326,23 @@ Creates, updates, deletes or gets a <code>logging_configuration</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "resource_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the web ACL that you want to associate with LogDestinationConfigs."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-loggingconfiguration.html"><code>AWS::WAFv2::LoggingConfiguration</code></a>.
 
@@ -326,31 +352,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>logging_configurations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ResourceArn, LogDestinationConfigs, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>logging_configurations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>logging_configurations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>logging_configurations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>logging_configurations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -359,6 +391,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>logging_configuration</code>.
 ```sql
 SELECT
@@ -371,6 +412,19 @@ logging_filter
 FROM awscc.wafv2.logging_configurations
 WHERE data__Identifier = '<ResourceArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>logging_configurations</code> in a region.
+```sql
+SELECT
+region,
+resource_arn
+FROM awscc.wafv2.logging_configurations_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -497,6 +551,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.wafv2.logging_configurations
+SET data__PatchDocument = string('{{ {
+    "LogDestinationConfigs": log_destination_configs,
+    "RedactedFields": redacted_fields,
+    "LoggingFilter": logging_filter
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<ResourceArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wafv2/logging_configurations_list_only/index.md b/website/docs/services/wafv2/logging_configurations_list_only/index.md
deleted file mode 100644
index fd0c2c12b..000000000
--- a/website/docs/services/wafv2/logging_configurations_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: logging_configurations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - logging_configurations_list_only
-  - wafv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>logging_configurations</code> in a region or regions, for all properties use <a href="/services/wafv2/logging_configurations/"><code>logging_configurations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>logging_configurations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A WAFv2 Logging Configuration Resource Provider</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wafv2.logging_configurations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "resource_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the web ACL that you want to associate with LogDestinationConfigs."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>logging_configurations</code> in a region.
-```sql
-SELECT
-region,
-resource_arn
-FROM awscc.wafv2.logging_configurations_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>logging_configurations_list_only</code> resource, see <a href="/services/wafv2/logging_configurations/#permissions"><code>logging_configurations</code></a>
-
diff --git a/website/docs/services/wafv2/regex_pattern_sets/index.md b/website/docs/services/wafv2/regex_pattern_sets/index.md
index 40d86e241..8bd86b317 100644
--- a/website/docs/services/wafv2/regex_pattern_sets/index.md
+++ b/website/docs/services/wafv2/regex_pattern_sets/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>regex_pattern_set</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -87,6 +96,33 @@ Creates, updates, deletes or gets a <code>regex_pattern_set</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Name of the RegexPatternSet."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Id of the RegexPatternSet"
+  },
+  {
+    "name": "scope",
+    "type": "string",
+    "description": "Use CLOUDFRONT for CloudFront RegexPatternSet, use REGIONAL for Application Load Balancer and API Gateway."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-regexpatternset.html"><code>AWS::WAFv2::RegexPatternSet</code></a>.
 
@@ -96,31 +132,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>regex_pattern_sets</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Scope, RegularExpressionList, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>regex_pattern_sets</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>regex_pattern_sets</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>regex_pattern_sets_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>regex_pattern_sets</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -129,6 +171,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>regex_pattern_set</code>.
 ```sql
 SELECT
@@ -143,6 +194,21 @@ tags
 FROM awscc.wafv2.regex_pattern_sets
 WHERE data__Identifier = '<Name>|<Id>|<Scope>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>regex_pattern_sets</code> in a region.
+```sql
+SELECT
+region,
+name,
+id,
+scope
+FROM awscc.wafv2.regex_pattern_sets_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -224,6 +290,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.wafv2.regex_pattern_sets
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "RegularExpressionList": regular_expression_list,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>|<Id>|<Scope>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wafv2/regex_pattern_sets_list_only/index.md b/website/docs/services/wafv2/regex_pattern_sets_list_only/index.md
deleted file mode 100644
index de529ec36..000000000
--- a/website/docs/services/wafv2/regex_pattern_sets_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: regex_pattern_sets_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - regex_pattern_sets_list_only
-  - wafv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>regex_pattern_sets</code> in a region or regions, for all properties use <a href="/services/wafv2/regex_pattern_sets/"><code>regex_pattern_sets</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>regex_pattern_sets_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Contains a list of Regular expressions based on the provided inputs. RegexPatternSet can be used with other WAF entities with RegexPatternSetReferenceStatement to perform other actions .</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wafv2.regex_pattern_sets_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Name of the RegexPatternSet."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Id of the RegexPatternSet"
-  },
-  {
-    "name": "scope",
-    "type": "string",
-    "description": "Use CLOUDFRONT for CloudFront RegexPatternSet, use REGIONAL for Application Load Balancer and API Gateway."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>regex_pattern_sets</code> in a region.
-```sql
-SELECT
-region,
-name,
-id,
-scope
-FROM awscc.wafv2.regex_pattern_sets_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>regex_pattern_sets_list_only</code> resource, see <a href="/services/wafv2/regex_pattern_sets/#permissions"><code>regex_pattern_sets</code></a>
-
diff --git a/website/docs/services/wafv2/rule_groups/index.md b/website/docs/services/wafv2/rule_groups/index.md
index 9b1499f97..643b042f5 100644
--- a/website/docs/services/wafv2/rule_groups/index.md
+++ b/website/docs/services/wafv2/rule_groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>rule_group</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -614,6 +623,33 @@ Creates, updates, deletes or gets a <code>rule_group</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Name of the WebACL."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Id of the WebACL"
+  },
+  {
+    "name": "scope",
+    "type": "string",
+    "description": "Use CLOUDFRONT for CloudFront WebACL, use REGIONAL for Application Load Balancer and API Gateway."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-rulegroup.html"><code>AWS::WAFv2::RuleGroup</code></a>.
 
@@ -623,31 +659,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>rule_groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Capacity, Scope, VisibilityConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>rule_groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>rule_groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>rule_groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>rule_groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -656,6 +698,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>rule_group</code>.
 ```sql
 SELECT
@@ -676,6 +727,21 @@ consumed_labels
 FROM awscc.wafv2.rule_groups
 WHERE data__Identifier = '<Name>|<Id>|<Scope>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>rule_groups</code> in a region.
+```sql
+SELECT
+region,
+name,
+id,
+scope
+FROM awscc.wafv2.rule_groups_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1029,6 +1095,24 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.wafv2.rule_groups
+SET data__PatchDocument = string('{{ {
+    "Capacity": capacity,
+    "Description": description,
+    "Rules": rules,
+    "VisibilityConfig": visibility_config,
+    "Tags": tags,
+    "CustomResponseBodies": custom_response_bodies
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>|<Id>|<Scope>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wafv2/rule_groups_list_only/index.md b/website/docs/services/wafv2/rule_groups_list_only/index.md
deleted file mode 100644
index b7106e73f..000000000
--- a/website/docs/services/wafv2/rule_groups_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: rule_groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - rule_groups_list_only
-  - wafv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>rule_groups</code> in a region or regions, for all properties use <a href="/services/wafv2/rule_groups/"><code>rule_groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>rule_groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Contains the Rules that identify the requests that you want to allow, block, or count. In a RuleGroup, you also specify a default action (ALLOW or BLOCK), and the action for each Rule that you add to a RuleGroup, for example, block requests from specified IP addresses or block requests from specified referrers. You also associate the RuleGroup with a CloudFront distribution to identify the requests that you want AWS WAF to filter. If you add more than one Rule to a RuleGroup, a request needs to match only one of the specifications to be allowed, blocked, or counted.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wafv2.rule_groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Name of the WebACL."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Id of the WebACL"
-  },
-  {
-    "name": "scope",
-    "type": "string",
-    "description": "Use CLOUDFRONT for CloudFront WebACL, use REGIONAL for Application Load Balancer and API Gateway."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>rule_groups</code> in a region.
-```sql
-SELECT
-region,
-name,
-id,
-scope
-FROM awscc.wafv2.rule_groups_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>rule_groups_list_only</code> resource, see <a href="/services/wafv2/rule_groups/#permissions"><code>rule_groups</code></a>
-
diff --git a/website/docs/services/wafv2/web_acls/index.md b/website/docs/services/wafv2/web_acls/index.md
index f51ef595a..6e41bad3c 100644
--- a/website/docs/services/wafv2/web_acls/index.md
+++ b/website/docs/services/wafv2/web_acls/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>web_acl</code> resource or lists <code
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "arn",
@@ -772,6 +781,33 @@ Creates, updates, deletes or gets a <code>web_acl</code> resource or lists <code
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Name of the WebACL."
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Id of the WebACL"
+  },
+  {
+    "name": "scope",
+    "type": "string",
+    "description": "Use CLOUDFRONT for CloudFront WebACL, use REGIONAL for Application Load Balancer and API Gateway."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webacl.html"><code>AWS::WAFv2::WebACL</code></a>.
 
@@ -781,31 +817,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>web_acls</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DefaultAction, Scope, VisibilityConfig, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>web_acls</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>web_acls</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>web_acls_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>web_acls</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -814,6 +856,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>web_acl</code>.
 ```sql
 SELECT
@@ -839,6 +890,21 @@ on_source_ddo_sprotection_config
 FROM awscc.wafv2.web_acls
 WHERE data__Identifier = '<Name>|<Id>|<Scope>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>web_acls</code> in a region.
+```sql
+SELECT
+region,
+name,
+id,
+scope
+FROM awscc.wafv2.web_acls_list_only
+;
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -1219,6 +1285,30 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.wafv2.web_acls
+SET data__PatchDocument = string('{{ {
+    "DefaultAction": default_action,
+    "Description": description,
+    "Rules": rules,
+    "VisibilityConfig": visibility_config,
+    "DataProtectionConfig": data_protection_config,
+    "Tags": tags,
+    "CustomResponseBodies": custom_response_bodies,
+    "CaptchaConfig": captcha_config,
+    "ChallengeConfig": challenge_config,
+    "TokenDomains": token_domains,
+    "AssociationConfig": association_config,
+    "OnSourceDDoSProtectionConfig": on_source_ddo_sprotection_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Name>|<Id>|<Scope>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wafv2/web_acls_list_only/index.md b/website/docs/services/wafv2/web_acls_list_only/index.md
deleted file mode 100644
index 6204ee9ec..000000000
--- a/website/docs/services/wafv2/web_acls_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: web_acls_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - web_acls_list_only
-  - wafv2
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>web_acls</code> in a region or regions, for all properties use <a href="/services/wafv2/web_acls/"><code>web_acls</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>web_acls_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Contains the Rules that identify the requests that you want to allow, block, or count. In a WebACL, you also specify a default action (ALLOW or BLOCK), and the action for each Rule that you add to a WebACL, for example, block requests from specified IP addresses or block requests from specified referrers. You also associate the WebACL with a CloudFront distribution to identify the requests that you want AWS WAF to filter. If you add more than one Rule to a WebACL, a request needs to match only one of the specifications to be allowed, blocked, or counted.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wafv2.web_acls_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "name",
-    "type": "string",
-    "description": "Name of the WebACL."
-  },
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Id of the WebACL"
-  },
-  {
-    "name": "scope",
-    "type": "string",
-    "description": "Use CLOUDFRONT for CloudFront WebACL, use REGIONAL for Application Load Balancer and API Gateway."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>web_acls</code> in a region.
-```sql
-SELECT
-region,
-name,
-id,
-scope
-FROM awscc.wafv2.web_acls_list_only
-;
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>web_acls_list_only</code> resource, see <a href="/services/wafv2/web_acls/#permissions"><code>web_acls</code></a>
-
diff --git a/website/docs/services/wafv2/webacl_associations/index.md b/website/docs/services/wafv2/webacl_associations/index.md
index 184f04f11..bf579bb12 100644
--- a/website/docs/services/wafv2/webacl_associations/index.md
+++ b/website/docs/services/wafv2/webacl_associations/index.md
@@ -157,6 +157,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wisdom/ai_agent_versions/index.md b/website/docs/services/wisdom/ai_agent_versions/index.md
index 626f915e6..3bf3d95e0 100644
--- a/website/docs/services/wisdom/ai_agent_versions/index.md
+++ b/website/docs/services/wisdom/ai_agent_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ai_agent_version</code> resource or l
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "a_iagent_arn",
@@ -75,6 +84,33 @@ Creates, updates, deletes or gets an <code>ai_agent_version</code> resource or l
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "a_iagent_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "assistant_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "version_number",
+    "type": "number",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-aiagentversion.html"><code>AWS::Wisdom::AIAgentVersion</code></a>.
 
@@ -84,31 +120,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ai_agent_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AssistantId, AIAgentId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ai_agent_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ai_agent_versions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ai_agent_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ai_agent_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +159,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ai_agent_version</code>.
 ```sql
 SELECT
@@ -131,6 +182,21 @@ modified_time_seconds
 FROM awscc.wisdom.ai_agent_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<AssistantId>|<AIAgentId>|<VersionNumber>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ai_agent_versions</code> in a region.
+```sql
+SELECT
+region,
+assistant_id,
+a_iagent_id,
+version_number
+FROM awscc.wisdom.ai_agent_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -201,6 +267,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wisdom/ai_agent_versions_list_only/index.md b/website/docs/services/wisdom/ai_agent_versions_list_only/index.md
deleted file mode 100644
index c99c842b6..000000000
--- a/website/docs/services/wisdom/ai_agent_versions_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: ai_agent_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ai_agent_versions_list_only
-  - wisdom
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ai_agent_versions</code> in a region or regions, for all properties use <a href="/services/wisdom/ai_agent_versions/"><code>ai_agent_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ai_agent_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Wisdom::AIAgentVersion Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wisdom.ai_agent_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "a_iagent_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "assistant_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "version_number",
-    "type": "number",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ai_agent_versions</code> in a region.
-```sql
-SELECT
-region,
-assistant_id,
-a_iagent_id,
-version_number
-FROM awscc.wisdom.ai_agent_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ai_agent_versions_list_only</code> resource, see <a href="/services/wisdom/ai_agent_versions/#permissions"><code>ai_agent_versions</code></a>
-
diff --git a/website/docs/services/wisdom/ai_agents/index.md b/website/docs/services/wisdom/ai_agents/index.md
index b31cee1d9..715f5e827 100644
--- a/website/docs/services/wisdom/ai_agents/index.md
+++ b/website/docs/services/wisdom/ai_agents/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ai_agent</code> resource or lists <co
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "a_iagent_id",
@@ -90,6 +99,28 @@ Creates, updates, deletes or gets an <code>ai_agent</code> resource or lists <co
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "a_iagent_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "assistant_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-aiagent.html"><code>AWS::Wisdom::AIAgent</code></a>.
 
@@ -99,31 +130,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ai_agents</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AssistantId, Configuration, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ai_agents</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ai_agents</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ai_agents_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ai_agents</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -132,6 +169,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ai_agent</code>.
 ```sql
 SELECT
@@ -149,6 +195,20 @@ modified_time_seconds
 FROM awscc.wisdom.ai_agents
 WHERE region = 'us-east-1' AND data__Identifier = '<AIAgentId>|<AssistantId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ai_agents</code> in a region.
+```sql
+SELECT
+region,
+a_iagent_id,
+assistant_id
+FROM awscc.wisdom.ai_agents_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -233,6 +293,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.wisdom.ai_agents
+SET data__PatchDocument = string('{{ {
+    "Configuration": configuration,
+    "Description": description
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AIAgentId>|<AssistantId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wisdom/ai_agents_list_only/index.md b/website/docs/services/wisdom/ai_agents_list_only/index.md
deleted file mode 100644
index 4420fd3b1..000000000
--- a/website/docs/services/wisdom/ai_agents_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: ai_agents_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ai_agents_list_only
-  - wisdom
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ai_agents</code> in a region or regions, for all properties use <a href="/services/wisdom/ai_agents/"><code>ai_agents</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ai_agents_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Wisdom::AIAgent Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wisdom.ai_agents_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "a_iagent_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "assistant_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ai_agents</code> in a region.
-```sql
-SELECT
-region,
-a_iagent_id,
-assistant_id
-FROM awscc.wisdom.ai_agents_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ai_agents_list_only</code> resource, see <a href="/services/wisdom/ai_agents/#permissions"><code>ai_agents</code></a>
-
diff --git a/website/docs/services/wisdom/ai_guardrail_versions/index.md b/website/docs/services/wisdom/ai_guardrail_versions/index.md
index fab562e53..61ddb0bed 100644
--- a/website/docs/services/wisdom/ai_guardrail_versions/index.md
+++ b/website/docs/services/wisdom/ai_guardrail_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ai_guardrail_version</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "a_iguardrail_arn",
@@ -75,6 +84,33 @@ Creates, updates, deletes or gets an <code>ai_guardrail_version</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "a_iguardrail_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "assistant_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "version_number",
+    "type": "number",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-aiguardrailversion.html"><code>AWS::Wisdom::AIGuardrailVersion</code></a>.
 
@@ -84,31 +120,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ai_guardrail_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AssistantId, AIGuardrailId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ai_guardrail_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ai_guardrail_versions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ai_guardrail_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ai_guardrail_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +159,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ai_guardrail_version</code>.
 ```sql
 SELECT
@@ -131,6 +182,21 @@ modified_time_seconds
 FROM awscc.wisdom.ai_guardrail_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<AssistantId>|<AIGuardrailId>|<VersionNumber>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ai_guardrail_versions</code> in a region.
+```sql
+SELECT
+region,
+assistant_id,
+a_iguardrail_id,
+version_number
+FROM awscc.wisdom.ai_guardrail_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -201,6 +267,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wisdom/ai_guardrail_versions_list_only/index.md b/website/docs/services/wisdom/ai_guardrail_versions_list_only/index.md
deleted file mode 100644
index 58b565a3f..000000000
--- a/website/docs/services/wisdom/ai_guardrail_versions_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: ai_guardrail_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ai_guardrail_versions_list_only
-  - wisdom
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ai_guardrail_versions</code> in a region or regions, for all properties use <a href="/services/wisdom/ai_guardrail_versions/"><code>ai_guardrail_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ai_guardrail_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Wisdom::AIGuardrailVersion Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wisdom.ai_guardrail_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "a_iguardrail_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "assistant_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "version_number",
-    "type": "number",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ai_guardrail_versions</code> in a region.
-```sql
-SELECT
-region,
-assistant_id,
-a_iguardrail_id,
-version_number
-FROM awscc.wisdom.ai_guardrail_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ai_guardrail_versions_list_only</code> resource, see <a href="/services/wisdom/ai_guardrail_versions/#permissions"><code>ai_guardrail_versions</code></a>
-
diff --git a/website/docs/services/wisdom/ai_guardrails/index.md b/website/docs/services/wisdom/ai_guardrails/index.md
index 28f64cd23..e99456cb6 100644
--- a/website/docs/services/wisdom/ai_guardrails/index.md
+++ b/website/docs/services/wisdom/ai_guardrails/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ai_guardrail</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "assistant_id",
@@ -249,6 +258,28 @@ Creates, updates, deletes or gets an <code>ai_guardrail</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "assistant_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "a_iguardrail_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-aiguardrail.html"><code>AWS::Wisdom::AIGuardrail</code></a>.
 
@@ -258,31 +289,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ai_guardrails</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AssistantId, BlockedInputMessaging, BlockedOutputsMessaging, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ai_guardrails</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ai_guardrails</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ai_guardrails_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ai_guardrails</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -291,6 +328,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ai_guardrail</code>.
 ```sql
 SELECT
@@ -312,6 +358,20 @@ tags
 FROM awscc.wisdom.ai_guardrails
 WHERE region = 'us-east-1' AND data__Identifier = '<AIGuardrailId>|<AssistantId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ai_guardrails</code> in a region.
+```sql
+SELECT
+region,
+a_iguardrail_id,
+assistant_id
+FROM awscc.wisdom.ai_guardrails_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -441,6 +501,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.wisdom.ai_guardrails
+SET data__PatchDocument = string('{{ {
+    "BlockedInputMessaging": blocked_input_messaging,
+    "BlockedOutputsMessaging": blocked_outputs_messaging,
+    "Description": description,
+    "TopicPolicyConfig": topic_policy_config,
+    "ContentPolicyConfig": content_policy_config,
+    "WordPolicyConfig": word_policy_config,
+    "SensitiveInformationPolicyConfig": sensitive_information_policy_config,
+    "ContextualGroundingPolicyConfig": contextual_grounding_policy_config
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AIGuardrailId>|<AssistantId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wisdom/ai_guardrails_list_only/index.md b/website/docs/services/wisdom/ai_guardrails_list_only/index.md
deleted file mode 100644
index 2a741ec53..000000000
--- a/website/docs/services/wisdom/ai_guardrails_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: ai_guardrails_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ai_guardrails_list_only
-  - wisdom
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ai_guardrails</code> in a region or regions, for all properties use <a href="/services/wisdom/ai_guardrails/"><code>ai_guardrails</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ai_guardrails_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Wisdom::AIGuardrail Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wisdom.ai_guardrails_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "assistant_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "a_iguardrail_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ai_guardrails</code> in a region.
-```sql
-SELECT
-region,
-a_iguardrail_id,
-assistant_id
-FROM awscc.wisdom.ai_guardrails_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ai_guardrails_list_only</code> resource, see <a href="/services/wisdom/ai_guardrails/#permissions"><code>ai_guardrails</code></a>
-
diff --git a/website/docs/services/wisdom/ai_prompt_versions/index.md b/website/docs/services/wisdom/ai_prompt_versions/index.md
index 8e8baca53..f6833341d 100644
--- a/website/docs/services/wisdom/ai_prompt_versions/index.md
+++ b/website/docs/services/wisdom/ai_prompt_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ai_prompt_version</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "a_iprompt_arn",
@@ -75,6 +84,33 @@ Creates, updates, deletes or gets an <code>ai_prompt_version</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "a_iprompt_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "assistant_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "version_number",
+    "type": "number",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-aipromptversion.html"><code>AWS::Wisdom::AIPromptVersion</code></a>.
 
@@ -84,31 +120,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ai_prompt_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AssistantId, AIPromptId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ai_prompt_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ai_prompt_versions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ai_prompt_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ai_prompt_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -117,6 +159,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ai_prompt_version</code>.
 ```sql
 SELECT
@@ -131,6 +182,21 @@ modified_time_seconds
 FROM awscc.wisdom.ai_prompt_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<AssistantId>|<AIPromptId>|<VersionNumber>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ai_prompt_versions</code> in a region.
+```sql
+SELECT
+region,
+assistant_id,
+a_iprompt_id,
+version_number
+FROM awscc.wisdom.ai_prompt_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -201,6 +267,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wisdom/ai_prompt_versions_list_only/index.md b/website/docs/services/wisdom/ai_prompt_versions_list_only/index.md
deleted file mode 100644
index f0e1644a2..000000000
--- a/website/docs/services/wisdom/ai_prompt_versions_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: ai_prompt_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ai_prompt_versions_list_only
-  - wisdom
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ai_prompt_versions</code> in a region or regions, for all properties use <a href="/services/wisdom/ai_prompt_versions/"><code>ai_prompt_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ai_prompt_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Wisdom::AIPromptVersion Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wisdom.ai_prompt_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "a_iprompt_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "assistant_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "version_number",
-    "type": "number",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ai_prompt_versions</code> in a region.
-```sql
-SELECT
-region,
-assistant_id,
-a_iprompt_id,
-version_number
-FROM awscc.wisdom.ai_prompt_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ai_prompt_versions_list_only</code> resource, see <a href="/services/wisdom/ai_prompt_versions/#permissions"><code>ai_prompt_versions</code></a>
-
diff --git a/website/docs/services/wisdom/ai_prompts/index.md b/website/docs/services/wisdom/ai_prompts/index.md
index 54f4316f4..505b22e4c 100644
--- a/website/docs/services/wisdom/ai_prompts/index.md
+++ b/website/docs/services/wisdom/ai_prompts/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ai_prompt</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "a_iprompt_id",
@@ -105,6 +114,28 @@ Creates, updates, deletes or gets an <code>ai_prompt</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "a_iprompt_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "assistant_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-aiprompt.html"><code>AWS::Wisdom::AIPrompt</code></a>.
 
@@ -114,31 +145,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ai_prompts</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="ApiFormat, ModelId, TemplateConfiguration, TemplateType, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ai_prompts</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ai_prompts</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ai_prompts_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ai_prompts</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -147,6 +184,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ai_prompt</code>.
 ```sql
 SELECT
@@ -167,6 +213,20 @@ modified_time_seconds
 FROM awscc.wisdom.ai_prompts
 WHERE region = 'us-east-1' AND data__Identifier = '<AIPromptId>|<AssistantId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ai_prompts</code> in a region.
+```sql
+SELECT
+region,
+a_iprompt_id,
+assistant_id
+FROM awscc.wisdom.ai_prompts_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -267,6 +327,21 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.wisdom.ai_prompts
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "ModelId": model_id,
+    "TemplateConfiguration": template_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AIPromptId>|<AssistantId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wisdom/ai_prompts_list_only/index.md b/website/docs/services/wisdom/ai_prompts_list_only/index.md
deleted file mode 100644
index 98e0479b6..000000000
--- a/website/docs/services/wisdom/ai_prompts_list_only/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: ai_prompts_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ai_prompts_list_only
-  - wisdom
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ai_prompts</code> in a region or regions, for all properties use <a href="/services/wisdom/ai_prompts/"><code>ai_prompts</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ai_prompts_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Wisdom::AIPrompt Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wisdom.ai_prompts_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "a_iprompt_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "assistant_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ai_prompts</code> in a region.
-```sql
-SELECT
-region,
-a_iprompt_id,
-assistant_id
-FROM awscc.wisdom.ai_prompts_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ai_prompts_list_only</code> resource, see <a href="/services/wisdom/ai_prompts/#permissions"><code>ai_prompts</code></a>
-
diff --git a/website/docs/services/wisdom/assistant_associations/index.md b/website/docs/services/wisdom/assistant_associations/index.md
index cdce2fc98..39a70882e 100644
--- a/website/docs/services/wisdom/assistant_associations/index.md
+++ b/website/docs/services/wisdom/assistant_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>assistant_association</code> resource
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "assistant_association_arn",
@@ -94,6 +103,40 @@ Creates, updates, deletes or gets an <code>assistant_association</code> resource
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "assistant_association_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "assistant_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "association",
+    "type": "object",
+    "description": "",
+    "children": [
+      {
+        "name": "knowledge_base_id",
+        "type": "string",
+        "description": ""
+      }
+    ]
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-assistantassociation.html"><code>AWS::Wisdom::AssistantAssociation</code></a>.
 
@@ -103,31 +146,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>assistant_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Association, AssociationType, AssistantId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>assistant_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>assistant_associations</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>assistant_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>assistant_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +185,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>assistant_association</code>.
 ```sql
 SELECT
@@ -150,6 +208,20 @@ tags
 FROM awscc.wisdom.assistant_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<AssistantAssociationId>|<AssistantId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>assistant_associations</code> in a region.
+```sql
+SELECT
+region,
+assistant_association_id,
+assistant_id
+FROM awscc.wisdom.assistant_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -229,6 +301,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wisdom/assistant_associations_list_only/index.md b/website/docs/services/wisdom/assistant_associations_list_only/index.md
deleted file mode 100644
index 9ceee9233..000000000
--- a/website/docs/services/wisdom/assistant_associations_list_only/index.md
+++ /dev/null
@@ -1,98 +0,0 @@
----
-title: assistant_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - assistant_associations_list_only
-  - wisdom
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>assistant_associations</code> in a region or regions, for all properties use <a href="/services/wisdom/assistant_associations/"><code>assistant_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>assistant_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Wisdom::AssistantAssociation Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wisdom.assistant_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "assistant_association_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "assistant_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "association",
-    "type": "object",
-    "description": "",
-    "children": [
-      {
-        "name": "knowledge_base_id",
-        "type": "string",
-        "description": ""
-      }
-    ]
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>assistant_associations</code> in a region.
-```sql
-SELECT
-region,
-assistant_association_id,
-assistant_id
-FROM awscc.wisdom.assistant_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>assistant_associations_list_only</code> resource, see <a href="/services/wisdom/assistant_associations/#permissions"><code>assistant_associations</code></a>
-
diff --git a/website/docs/services/wisdom/assistants/index.md b/website/docs/services/wisdom/assistants/index.md
index a81931c71..d38ab843c 100644
--- a/website/docs/services/wisdom/assistants/index.md
+++ b/website/docs/services/wisdom/assistants/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>assistant</code> resource or lists <c
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "type",
@@ -94,6 +103,23 @@ Creates, updates, deletes or gets an <code>assistant</code> resource or lists <c
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "assistant_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-assistant.html"><code>AWS::Wisdom::Assistant</code></a>.
 
@@ -103,31 +129,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>assistants</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Type, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>assistants</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>assistants</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>assistants_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>assistants</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -136,6 +168,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>assistant</code>.
 ```sql
 SELECT
@@ -150,6 +191,19 @@ name
 FROM awscc.wisdom.assistants
 WHERE region = 'us-east-1' AND data__Identifier = '<AssistantId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>assistants</code> in a region.
+```sql
+SELECT
+region,
+assistant_id
+FROM awscc.wisdom.assistants_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -231,6 +285,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wisdom/assistants_list_only/index.md b/website/docs/services/wisdom/assistants_list_only/index.md
deleted file mode 100644
index a45b97669..000000000
--- a/website/docs/services/wisdom/assistants_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: assistants_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - assistants_list_only
-  - wisdom
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>assistants</code> in a region or regions, for all properties use <a href="/services/wisdom/assistants/"><code>assistants</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>assistants_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Wisdom::Assistant Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wisdom.assistants_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "assistant_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>assistants</code> in a region.
-```sql
-SELECT
-region,
-assistant_id
-FROM awscc.wisdom.assistants_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>assistants_list_only</code> resource, see <a href="/services/wisdom/assistants/#permissions"><code>assistants</code></a>
-
diff --git a/website/docs/services/wisdom/index.md b/website/docs/services/wisdom/index.md
index 6f4e60810..201848ae1 100644
--- a/website/docs/services/wisdom/index.md
+++ b/website/docs/services/wisdom/index.md
@@ -20,7 +20,7 @@ The wisdom service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>24</b></span><br />
+<span>total resources:&nbsp;<b>12</b></span><br />
 </div>
 </div>
 
@@ -30,30 +30,18 @@ The wisdom service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/wisdom/ai_agent_versions/">ai_agent_versions</a><br />
-<a href="/services/wisdom/ai_agent_versions_list_only/">ai_agent_versions_list_only</a><br />
 <a href="/services/wisdom/ai_agents/">ai_agents</a><br />
-<a href="/services/wisdom/ai_agents_list_only/">ai_agents_list_only</a><br />
 <a href="/services/wisdom/ai_guardrail_versions/">ai_guardrail_versions</a><br />
-<a href="/services/wisdom/ai_guardrail_versions_list_only/">ai_guardrail_versions_list_only</a><br />
 <a href="/services/wisdom/ai_guardrails/">ai_guardrails</a><br />
-<a href="/services/wisdom/ai_guardrails_list_only/">ai_guardrails_list_only</a><br />
 <a href="/services/wisdom/ai_prompt_versions/">ai_prompt_versions</a><br />
-<a href="/services/wisdom/ai_prompt_versions_list_only/">ai_prompt_versions_list_only</a><br />
-<a href="/services/wisdom/ai_prompts/">ai_prompts</a><br />
-<a href="/services/wisdom/ai_prompts_list_only/">ai_prompts_list_only</a>
+<a href="/services/wisdom/ai_prompts/">ai_prompts</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/wisdom/assistant_associations/">assistant_associations</a><br />
-<a href="/services/wisdom/assistant_associations_list_only/">assistant_associations_list_only</a><br />
 <a href="/services/wisdom/assistants/">assistants</a><br />
-<a href="/services/wisdom/assistants_list_only/">assistants_list_only</a><br />
 <a href="/services/wisdom/knowledge_bases/">knowledge_bases</a><br />
-<a href="/services/wisdom/knowledge_bases_list_only/">knowledge_bases_list_only</a><br />
 <a href="/services/wisdom/message_template_versions/">message_template_versions</a><br />
-<a href="/services/wisdom/message_template_versions_list_only/">message_template_versions_list_only</a><br />
 <a href="/services/wisdom/message_templates/">message_templates</a><br />
-<a href="/services/wisdom/message_templates_list_only/">message_templates_list_only</a><br />
-<a href="/services/wisdom/quick_responses/">quick_responses</a><br />
-<a href="/services/wisdom/quick_responses_list_only/">quick_responses_list_only</a>
+<a href="/services/wisdom/quick_responses/">quick_responses</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/wisdom/knowledge_bases/index.md b/website/docs/services/wisdom/knowledge_bases/index.md
index 193ec8bd3..faaae1ed5 100644
--- a/website/docs/services/wisdom/knowledge_bases/index.md
+++ b/website/docs/services/wisdom/knowledge_bases/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>knowledge_base</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "description",
@@ -215,6 +224,23 @@ Creates, updates, deletes or gets a <code>knowledge_base</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "knowledge_base_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-knowledgebase.html"><code>AWS::Wisdom::KnowledgeBase</code></a>.
 
@@ -224,31 +250,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>knowledge_bases</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="KnowledgeBaseType, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>knowledge_bases</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>knowledge_bases</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>knowledge_bases_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>knowledge_bases</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -257,6 +289,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>knowledge_base</code>.
 ```sql
 SELECT
@@ -274,6 +315,19 @@ tags
 FROM awscc.wisdom.knowledge_bases
 WHERE region = 'us-east-1' AND data__Identifier = '<KnowledgeBaseId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>knowledge_bases</code> in a region.
+```sql
+SELECT
+region,
+knowledge_base_id
+FROM awscc.wisdom.knowledge_bases_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -387,6 +441,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.wisdom.knowledge_bases
+SET data__PatchDocument = string('{{ {
+    "RenderingConfiguration": rendering_configuration,
+    "VectorIngestionConfiguration": vector_ingestion_configuration
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<KnowledgeBaseId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wisdom/knowledge_bases_list_only/index.md b/website/docs/services/wisdom/knowledge_bases_list_only/index.md
deleted file mode 100644
index 89bd04e0b..000000000
--- a/website/docs/services/wisdom/knowledge_bases_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: knowledge_bases_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - knowledge_bases_list_only
-  - wisdom
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>knowledge_bases</code> in a region or regions, for all properties use <a href="/services/wisdom/knowledge_bases/"><code>knowledge_bases</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>knowledge_bases_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Wisdom::KnowledgeBase Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wisdom.knowledge_bases_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "knowledge_base_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>knowledge_bases</code> in a region.
-```sql
-SELECT
-region,
-knowledge_base_id
-FROM awscc.wisdom.knowledge_bases_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>knowledge_bases_list_only</code> resource, see <a href="/services/wisdom/knowledge_bases/#permissions"><code>knowledge_bases</code></a>
-
diff --git a/website/docs/services/wisdom/message_template_versions/index.md b/website/docs/services/wisdom/message_template_versions/index.md
index 2a0548ecf..d804ab70a 100644
--- a/website/docs/services/wisdom/message_template_versions/index.md
+++ b/website/docs/services/wisdom/message_template_versions/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>message_template_version</code> resour
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "message_template_arn",
@@ -60,6 +69,23 @@ Creates, updates, deletes or gets a <code>message_template_version</code> resour
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "message_template_version_arn",
+    "type": "string",
+    "description": "The unqualified Amazon Resource Name (ARN) of the message template version."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-messagetemplateversion.html"><code>AWS::Wisdom::MessageTemplateVersion</code></a>.
 
@@ -69,31 +95,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>message_template_versions</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="MessageTemplateArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>message_template_versions</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>message_template_versions</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>message_template_versions_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>message_template_versions</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -102,6 +134,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>message_template_version</code>.
 ```sql
 SELECT
@@ -113,6 +154,19 @@ message_template_version_number
 FROM awscc.wisdom.message_template_versions
 WHERE region = 'us-east-1' AND data__Identifier = '<MessageTemplateVersionArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>message_template_versions</code> in a region.
+```sql
+SELECT
+region,
+message_template_version_arn
+FROM awscc.wisdom.message_template_versions_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -177,6 +231,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.wisdom.message_template_versions
+SET data__PatchDocument = string('{{ {
+    "MessageTemplateContentSha256": message_template_content_sha256
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<MessageTemplateVersionArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wisdom/message_template_versions_list_only/index.md b/website/docs/services/wisdom/message_template_versions_list_only/index.md
deleted file mode 100644
index 3c45b2ba1..000000000
--- a/website/docs/services/wisdom/message_template_versions_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: message_template_versions_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - message_template_versions_list_only
-  - wisdom
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>message_template_versions</code> in a region or regions, for all properties use <a href="/services/wisdom/message_template_versions/"><code>message_template_versions</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>message_template_versions_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>A version for the specified customer-managed message template within the specified knowledge base.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wisdom.message_template_versions_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "message_template_version_arn",
-    "type": "string",
-    "description": "The unqualified Amazon Resource Name (ARN) of the message template version."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>message_template_versions</code> in a region.
-```sql
-SELECT
-region,
-message_template_version_arn
-FROM awscc.wisdom.message_template_versions_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>message_template_versions_list_only</code> resource, see <a href="/services/wisdom/message_template_versions/#permissions"><code>message_template_versions</code></a>
-
diff --git a/website/docs/services/wisdom/message_templates/index.md b/website/docs/services/wisdom/message_templates/index.md
index b46b6e25d..005e73a84 100644
--- a/website/docs/services/wisdom/message_templates/index.md
+++ b/website/docs/services/wisdom/message_templates/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>message_template</code> resource or li
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "knowledge_base_arn",
@@ -553,6 +562,23 @@ Creates, updates, deletes or gets a <code>message_template</code> resource or li
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "message_template_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the message template."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-messagetemplate.html"><code>AWS::Wisdom::MessageTemplate</code></a>.
 
@@ -562,31 +588,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>message_templates</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="KnowledgeBaseArn, ChannelSubtype, Name, Content, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>message_templates</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>message_templates</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>message_templates_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>message_templates</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -595,6 +627,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>message_template</code>.
 ```sql
 SELECT
@@ -615,6 +656,19 @@ tags
 FROM awscc.wisdom.message_templates
 WHERE region = 'us-east-1' AND data__Identifier = '<MessageTemplateArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>message_templates</code> in a region.
+```sql
+SELECT
+region,
+message_template_arn
+FROM awscc.wisdom.message_templates_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -805,6 +859,25 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.wisdom.message_templates
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "Content": content,
+    "Description": description,
+    "Language": language,
+    "GroupingConfiguration": grouping_configuration,
+    "DefaultAttributes": default_attributes,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<MessageTemplateArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wisdom/message_templates_list_only/index.md b/website/docs/services/wisdom/message_templates_list_only/index.md
deleted file mode 100644
index cd5e7b111..000000000
--- a/website/docs/services/wisdom/message_templates_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: message_templates_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - message_templates_list_only
-  - wisdom
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>message_templates</code> in a region or regions, for all properties use <a href="/services/wisdom/message_templates/"><code>message_templates</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>message_templates_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Wisdom::MessageTemplate Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wisdom.message_templates_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "message_template_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the message template."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>message_templates</code> in a region.
-```sql
-SELECT
-region,
-message_template_arn
-FROM awscc.wisdom.message_templates_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>message_templates_list_only</code> resource, see <a href="/services/wisdom/message_templates/#permissions"><code>message_templates</code></a>
-
diff --git a/website/docs/services/wisdom/quick_responses/index.md b/website/docs/services/wisdom/quick_responses/index.md
index be0d692d2..feb186e09 100644
--- a/website/docs/services/wisdom/quick_responses/index.md
+++ b/website/docs/services/wisdom/quick_responses/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>quick_response</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "content_type",
@@ -146,6 +155,23 @@ Creates, updates, deletes or gets a <code>quick_response</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "quick_response_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the quick response."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-quickresponse.html"><code>AWS::Wisdom::QuickResponse</code></a>.
 
@@ -155,31 +181,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>quick_responses</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="KnowledgeBaseArn, Content, Name, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>quick_responses</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>quick_responses</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>quick_responses_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>quick_responses</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -188,6 +220,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>quick_response</code>.
 ```sql
 SELECT
@@ -210,6 +251,19 @@ tags
 FROM awscc.wisdom.quick_responses
 WHERE region = 'us-east-1' AND data__Identifier = '<QuickResponseArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>quick_responses</code> in a region.
+```sql
+SELECT
+region,
+quick_response_arn
+FROM awscc.wisdom.quick_responses_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -321,6 +375,28 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.wisdom.quick_responses
+SET data__PatchDocument = string('{{ {
+    "ContentType": content_type,
+    "Name": name,
+    "Channels": channels,
+    "Content": content,
+    "Description": description,
+    "GroupingConfiguration": grouping_configuration,
+    "IsActive": is_active,
+    "Language": language,
+    "ShortcutKey": shortcut_key,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<QuickResponseArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/wisdom/quick_responses_list_only/index.md b/website/docs/services/wisdom/quick_responses_list_only/index.md
deleted file mode 100644
index 5b1b8f03e..000000000
--- a/website/docs/services/wisdom/quick_responses_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: quick_responses_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - quick_responses_list_only
-  - wisdom
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>quick_responses</code> in a region or regions, for all properties use <a href="/services/wisdom/quick_responses/"><code>quick_responses</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>quick_responses_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::Wisdom::QuickResponse Resource Type.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.wisdom.quick_responses_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "quick_response_arn",
-    "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the quick response."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>quick_responses</code> in a region.
-```sql
-SELECT
-region,
-quick_response_arn
-FROM awscc.wisdom.quick_responses_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>quick_responses_list_only</code> resource, see <a href="/services/wisdom/quick_responses/#permissions"><code>quick_responses</code></a>
-
diff --git a/website/docs/services/workspaces/connection_aliases/index.md b/website/docs/services/workspaces/connection_aliases/index.md
index e5835ad1c..16d07e091 100644
--- a/website/docs/services/workspaces/connection_aliases/index.md
+++ b/website/docs/services/workspaces/connection_aliases/index.md
@@ -209,6 +209,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspaces/index.md b/website/docs/services/workspaces/index.md
index 7abc2c182..7895fd316 100644
--- a/website/docs/services/workspaces/index.md
+++ b/website/docs/services/workspaces/index.md
@@ -20,7 +20,7 @@ The workspaces service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>3</b></span><br />
+<span>total resources:&nbsp;<b>2</b></span><br />
 </div>
 </div>
 
@@ -29,10 +29,9 @@ The workspaces service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/workspaces/connection_aliases/">connection_aliases</a><br />
-<a href="/services/workspaces/workspaces_pools/">workspaces_pools</a>
+<a href="/services/workspaces/connection_aliases/">connection_aliases</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/workspaces/workspaces_pools_list_only/">workspaces_pools_list_only</a>
+<a href="/services/workspaces/workspaces_pools/">workspaces_pools</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/workspaces/workspaces_pools/index.md b/website/docs/services/workspaces/workspaces_pools/index.md
index dc7a249a4..ca058c229 100644
--- a/website/docs/services/workspaces/workspaces_pools/index.md
+++ b/website/docs/services/workspaces/workspaces_pools/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>workspaces_pool</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "pool_id",
@@ -148,6 +157,23 @@ Creates, updates, deletes or gets a <code>workspaces_pool</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "pool_id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspacespool.html"><code>AWS::WorkSpaces::WorkspacesPool</code></a>.
 
@@ -157,31 +183,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>workspaces_pools</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PoolName, BundleId, DirectoryId, Capacity, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>workspaces_pools</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>workspaces_pools</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>workspaces_pools_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>workspaces_pools</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -190,6 +222,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>workspaces_pool</code>.
 ```sql
 SELECT
@@ -209,6 +250,19 @@ tags
 FROM awscc.workspaces.workspaces_pools
 WHERE region = 'us-east-1' AND data__Identifier = '<PoolId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>workspaces_pools</code> in a region.
+```sql
+SELECT
+region,
+pool_id
+FROM awscc.workspaces.workspaces_pools_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -315,6 +369,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.workspaces.workspaces_pools
+SET data__PatchDocument = string('{{ {
+    "Capacity": capacity,
+    "Description": description,
+    "BundleId": bundle_id,
+    "DirectoryId": directory_id,
+    "ApplicationSettings": application_settings,
+    "TimeoutSettings": timeout_settings,
+    "RunningMode": running_mode,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PoolId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspaces/workspaces_pools_list_only/index.md b/website/docs/services/workspaces/workspaces_pools_list_only/index.md
deleted file mode 100644
index 41bef716c..000000000
--- a/website/docs/services/workspaces/workspaces_pools_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: workspaces_pools_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - workspaces_pools_list_only
-  - workspaces
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>workspaces_pools</code> in a region or regions, for all properties use <a href="/services/workspaces/workspaces_pools/"><code>workspaces_pools</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>workspaces_pools_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::WorkSpaces::WorkspacesPool</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.workspaces.workspaces_pools_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "pool_id",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>workspaces_pools</code> in a region.
-```sql
-SELECT
-region,
-pool_id
-FROM awscc.workspaces.workspaces_pools_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>workspaces_pools_list_only</code> resource, see <a href="/services/workspaces/workspaces_pools/#permissions"><code>workspaces_pools</code></a>
-
diff --git a/website/docs/services/workspacesinstances/index.md b/website/docs/services/workspacesinstances/index.md
index a8c64b82b..b5c7363c7 100644
--- a/website/docs/services/workspacesinstances/index.md
+++ b/website/docs/services/workspacesinstances/index.md
@@ -20,7 +20,7 @@ The workspacesinstances service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -30,12 +30,9 @@ The workspacesinstances service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/workspacesinstances/volume_associations/">volume_associations</a><br />
-<a href="/services/workspacesinstances/volume_associations_list_only/">volume_associations_list_only</a><br />
 <a href="/services/workspacesinstances/volumes/">volumes</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/workspacesinstances/volumes_list_only/">volumes_list_only</a><br />
-<a href="/services/workspacesinstances/workspace_instances/">workspace_instances</a><br />
-<a href="/services/workspacesinstances/workspace_instances_list_only/">workspace_instances_list_only</a>
+<a href="/services/workspacesinstances/workspace_instances/">workspace_instances</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/workspacesinstances/volume_associations/index.md b/website/docs/services/workspacesinstances/volume_associations/index.md
index d4697ebcc..811563663 100644
--- a/website/docs/services/workspacesinstances/volume_associations/index.md
+++ b/website/docs/services/workspacesinstances/volume_associations/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>volume_association</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "workspace_instance_id",
@@ -60,6 +69,33 @@ Creates, updates, deletes or gets a <code>volume_association</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "workspace_instance_id",
+    "type": "string",
+    "description": "ID of the workspace instance to associate with the volume"
+  },
+  {
+    "name": "volume_id",
+    "type": "string",
+    "description": "ID of the volume to attach to the workspace instance"
+  },
+  {
+    "name": "device",
+    "type": "string",
+    "description": "The device name for the volume attachment"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesinstances-volumeassociation.html"><code>AWS::WorkspacesInstances::VolumeAssociation</code></a>.
 
@@ -69,26 +105,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>volume_associations</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="WorkspaceInstanceId, VolumeId, Device, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>volume_associations</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>volume_associations_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>volume_associations</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +138,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>volume_association</code>.
 ```sql
 SELECT
@@ -108,6 +158,21 @@ disassociate_mode
 FROM awscc.workspacesinstances.volume_associations
 WHERE region = 'us-east-1' AND data__Identifier = '<WorkspaceInstanceId>|<VolumeId>|<Device>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>volume_associations</code> in a region.
+```sql
+SELECT
+region,
+workspace_instance_id,
+volume_id,
+device
+FROM awscc.workspacesinstances.volume_associations_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -184,6 +249,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspacesinstances/volume_associations_list_only/index.md b/website/docs/services/workspacesinstances/volume_associations_list_only/index.md
deleted file mode 100644
index 81adb56b0..000000000
--- a/website/docs/services/workspacesinstances/volume_associations_list_only/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: volume_associations_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - volume_associations_list_only
-  - workspacesinstances
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>volume_associations</code> in a region or regions, for all properties use <a href="/services/workspacesinstances/volume_associations/"><code>volume_associations</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>volume_associations_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::WorkspacesInstances::VolumeAssociation</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.workspacesinstances.volume_associations_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "workspace_instance_id",
-    "type": "string",
-    "description": "ID of the workspace instance to associate with the volume"
-  },
-  {
-    "name": "volume_id",
-    "type": "string",
-    "description": "ID of the volume to attach to the workspace instance"
-  },
-  {
-    "name": "device",
-    "type": "string",
-    "description": "The device name for the volume attachment"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>volume_associations</code> in a region.
-```sql
-SELECT
-region,
-workspace_instance_id,
-volume_id,
-device
-FROM awscc.workspacesinstances.volume_associations_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>volume_associations_list_only</code> resource, see <a href="/services/workspacesinstances/volume_associations/#permissions"><code>volume_associations</code></a>
-
diff --git a/website/docs/services/workspacesinstances/volumes/index.md b/website/docs/services/workspacesinstances/volumes/index.md
index ad90b69ed..4ed41e544 100644
--- a/website/docs/services/workspacesinstances/volumes/index.md
+++ b/website/docs/services/workspacesinstances/volumes/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>volume</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "volume_id",
@@ -114,6 +123,23 @@ Creates, updates, deletes or gets a <code>volume</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "volume_id",
+    "type": "string",
+    "description": "Unique identifier for the volume"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesinstances-volume.html"><code>AWS::WorkspacesInstances::Volume</code></a>.
 
@@ -123,26 +149,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>volumes</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="AvailabilityZone, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>volumes</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>volumes_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>volumes</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +182,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>volume</code>.
 ```sql
 SELECT
@@ -168,6 +208,19 @@ tag_specifications
 FROM awscc.workspacesinstances.volumes
 WHERE region = 'us-east-1' AND data__Identifier = '<VolumeId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>volumes</code> in a region.
+```sql
+SELECT
+region,
+volume_id
+FROM awscc.workspacesinstances.volumes_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -264,6 +317,7 @@ resources:
 </TabItem>
 </Tabs>
 
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspacesinstances/volumes_list_only/index.md b/website/docs/services/workspacesinstances/volumes_list_only/index.md
deleted file mode 100644
index 921657315..000000000
--- a/website/docs/services/workspacesinstances/volumes_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: volumes_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - volumes_list_only
-  - workspacesinstances
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>volumes</code> in a region or regions, for all properties use <a href="/services/workspacesinstances/volumes/"><code>volumes</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>volumes_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::WorkspacesInstances::Volume - Manages WorkSpaces Volume resources</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.workspacesinstances.volumes_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "volume_id",
-    "type": "string",
-    "description": "Unique identifier for the volume"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>volumes</code> in a region.
-```sql
-SELECT
-region,
-volume_id
-FROM awscc.workspacesinstances.volumes_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>volumes_list_only</code> resource, see <a href="/services/workspacesinstances/volumes/#permissions"><code>volumes</code></a>
-
diff --git a/website/docs/services/workspacesinstances/workspace_instances/index.md b/website/docs/services/workspacesinstances/workspace_instances/index.md
index a91493008..ac2076663 100644
--- a/website/docs/services/workspacesinstances/workspace_instances/index.md
+++ b/website/docs/services/workspacesinstances/workspace_instances/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>workspace_instance</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "managed_instance",
@@ -518,6 +527,23 @@ Creates, updates, deletes or gets a <code>workspace_instance</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "workspace_instance_id",
+    "type": "string",
+    "description": "Unique identifier for the workspace instance"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesinstances-workspaceinstance.html"><code>AWS::WorkspacesInstances::WorkspaceInstance</code></a>.
 
@@ -527,31 +553,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>workspace_instances</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code=", region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>workspace_instances</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>workspace_instances</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>workspace_instances_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>workspace_instances</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -560,6 +592,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>workspace_instance</code>.
 ```sql
 SELECT
@@ -572,6 +613,19 @@ e_c2_managed_instance
 FROM awscc.workspacesinstances.workspace_instances
 WHERE region = 'us-east-1' AND data__Identifier = '<WorkspaceInstanceId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>workspace_instances</code> in a region.
+```sql
+SELECT
+region,
+workspace_instance_id
+FROM awscc.workspacesinstances.workspace_instances_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -716,6 +770,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.workspacesinstances.workspace_instances
+SET data__PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<WorkspaceInstanceId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspacesinstances/workspace_instances_list_only/index.md b/website/docs/services/workspacesinstances/workspace_instances_list_only/index.md
deleted file mode 100644
index 84b25bf2e..000000000
--- a/website/docs/services/workspacesinstances/workspace_instances_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: workspace_instances_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - workspace_instances_list_only
-  - workspacesinstances
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>workspace_instances</code> in a region or regions, for all properties use <a href="/services/workspacesinstances/workspace_instances/"><code>workspace_instances</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>workspace_instances_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource Type definition for AWS::WorkspacesInstances::WorkspaceInstance</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.workspacesinstances.workspace_instances_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "workspace_instance_id",
-    "type": "string",
-    "description": "Unique identifier for the workspace instance"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>workspace_instances</code> in a region.
-```sql
-SELECT
-region,
-workspace_instance_id
-FROM awscc.workspacesinstances.workspace_instances_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>workspace_instances_list_only</code> resource, see <a href="/services/workspacesinstances/workspace_instances/#permissions"><code>workspace_instances</code></a>
-
diff --git a/website/docs/services/workspacesthinclient/environments/index.md b/website/docs/services/workspacesthinclient/environments/index.md
index 522f9d87f..821442e23 100644
--- a/website/docs/services/workspacesthinclient/environments/index.md
+++ b/website/docs/services/workspacesthinclient/environments/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "id",
@@ -179,6 +188,23 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "id",
+    "type": "string",
+    "description": "Unique identifier of the environment."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesthinclient-environment.html"><code>AWS::WorkSpacesThinClient::Environment</code></a>.
 
@@ -188,31 +214,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="DesktopArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>environments_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>environments</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -221,6 +253,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>environment</code>.
 ```sql
 SELECT
@@ -248,6 +289,19 @@ device_creation_tags
 FROM awscc.workspacesthinclient.environments
 WHERE region = 'us-east-1' AND data__Identifier = '<Id>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>environments</code> in a region.
+```sql
+SELECT
+region,
+id
+FROM awscc.workspacesthinclient.environments_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -355,6 +409,26 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.workspacesthinclient.environments
+SET data__PatchDocument = string('{{ {
+    "Name": name,
+    "DesktopEndpoint": desktop_endpoint,
+    "SoftwareSetUpdateSchedule": software_set_update_schedule,
+    "MaintenanceWindow": maintenance_window,
+    "SoftwareSetUpdateMode": software_set_update_mode,
+    "DesiredSoftwareSetId": desired_software_set_id,
+    "Tags": tags,
+    "DeviceCreationTags": device_creation_tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<Id>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspacesthinclient/environments_list_only/index.md b/website/docs/services/workspacesthinclient/environments_list_only/index.md
deleted file mode 100644
index eee9d95e2..000000000
--- a/website/docs/services/workspacesthinclient/environments_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: environments_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - environments_list_only
-  - workspacesthinclient
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>environments</code> in a region or regions, for all properties use <a href="/services/workspacesthinclient/environments/"><code>environments</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>environments_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Resource type definition for AWS::WorkSpacesThinClient::Environment.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.workspacesthinclient.environments_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "id",
-    "type": "string",
-    "description": "Unique identifier of the environment."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>environments</code> in a region.
-```sql
-SELECT
-region,
-id
-FROM awscc.workspacesthinclient.environments_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>environments_list_only</code> resource, see <a href="/services/workspacesthinclient/environments/#permissions"><code>environments</code></a>
-
diff --git a/website/docs/services/workspacesthinclient/index.md b/website/docs/services/workspacesthinclient/index.md
index 3cd1853ba..ad91de90e 100644
--- a/website/docs/services/workspacesthinclient/index.md
+++ b/website/docs/services/workspacesthinclient/index.md
@@ -20,7 +20,7 @@ The workspacesthinclient service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>1</b></span><br />
 </div>
 </div>
 
@@ -32,6 +32,6 @@ The workspacesthinclient service documentation.
 <a href="/services/workspacesthinclient/environments/">environments</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/workspacesthinclient/environments_list_only/">environments_list_only</a>
+
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/workspacesweb/browser_settings/index.md b/website/docs/services/workspacesweb/browser_settings/index.md
index e01e486cd..493aed1a2 100644
--- a/website/docs/services/workspacesweb/browser_settings/index.md
+++ b/website/docs/services/workspacesweb/browser_settings/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>browser_setting</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "additional_encryption_context",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>browser_setting</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "browser_settings_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-browsersetting.html"><code>AWS::WorkSpacesWeb::BrowserSettings</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>browser_settings</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>browser_settings</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>browser_settings</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>browser_settings_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>browser_settings</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>browser_setting</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.workspacesweb.browser_settings
 WHERE region = 'us-east-1' AND data__Identifier = '<BrowserSettingsArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>browser_settings</code> in a region.
+```sql
+SELECT
+region,
+browser_settings_arn
+FROM awscc.workspacesweb.browser_settings_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +271,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.workspacesweb.browser_settings
+SET data__PatchDocument = string('{{ {
+    "BrowserPolicy": browser_policy,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<BrowserSettingsArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspacesweb/browser_settings_list_only/index.md b/website/docs/services/workspacesweb/browser_settings_list_only/index.md
deleted file mode 100644
index 3f70d92e0..000000000
--- a/website/docs/services/workspacesweb/browser_settings_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: browser_settings_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - browser_settings_list_only
-  - workspacesweb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>browser_settings</code> in a region or regions, for all properties use <a href="/services/workspacesweb/browser_settings/"><code>browser_settings</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>browser_settings_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::WorkSpacesWeb::BrowserSettings Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.workspacesweb.browser_settings_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "browser_settings_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>browser_settings</code> in a region.
-```sql
-SELECT
-region,
-browser_settings_arn
-FROM awscc.workspacesweb.browser_settings_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>browser_settings_list_only</code> resource, see <a href="/services/workspacesweb/browser_settings/#permissions"><code>browser_settings</code></a>
-
diff --git a/website/docs/services/workspacesweb/data_protection_settings/index.md b/website/docs/services/workspacesweb/data_protection_settings/index.md
index 26bcdc7a9..ed420ff9a 100644
--- a/website/docs/services/workspacesweb/data_protection_settings/index.md
+++ b/website/docs/services/workspacesweb/data_protection_settings/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>data_protection_setting</code> resourc
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "additional_encryption_context",
@@ -185,6 +194,23 @@ Creates, updates, deletes or gets a <code>data_protection_setting</code> resourc
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "data_protection_settings_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-dataprotectionsetting.html"><code>AWS::WorkSpacesWeb::DataProtectionSettings</code></a>.
 
@@ -194,31 +220,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>data_protection_settings</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>data_protection_settings</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>data_protection_settings</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>data_protection_settings_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>data_protection_settings</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -227,6 +259,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>data_protection_setting</code>.
 ```sql
 SELECT
@@ -243,6 +284,19 @@ tags
 FROM awscc.workspacesweb.data_protection_settings
 WHERE region = 'us-east-1' AND data__Identifier = '<DataProtectionSettingsArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>data_protection_settings</code> in a region.
+```sql
+SELECT
+region,
+data_protection_settings_arn
+FROM awscc.workspacesweb.data_protection_settings_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -355,6 +409,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.workspacesweb.data_protection_settings
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "DisplayName": display_name,
+    "InlineRedactionConfiguration": inline_redaction_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<DataProtectionSettingsArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspacesweb/data_protection_settings_list_only/index.md b/website/docs/services/workspacesweb/data_protection_settings_list_only/index.md
deleted file mode 100644
index eec0373d2..000000000
--- a/website/docs/services/workspacesweb/data_protection_settings_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: data_protection_settings_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - data_protection_settings_list_only
-  - workspacesweb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>data_protection_settings</code> in a region or regions, for all properties use <a href="/services/workspacesweb/data_protection_settings/"><code>data_protection_settings</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>data_protection_settings_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::WorkSpacesWeb::DataProtectionSettings Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.workspacesweb.data_protection_settings_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "data_protection_settings_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>data_protection_settings</code> in a region.
-```sql
-SELECT
-region,
-data_protection_settings_arn
-FROM awscc.workspacesweb.data_protection_settings_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>data_protection_settings_list_only</code> resource, see <a href="/services/workspacesweb/data_protection_settings/#permissions"><code>data_protection_settings</code></a>
-
diff --git a/website/docs/services/workspacesweb/identity_providers/index.md b/website/docs/services/workspacesweb/identity_providers/index.md
index 6a234a1ce..97436db80 100644
--- a/website/docs/services/workspacesweb/identity_providers/index.md
+++ b/website/docs/services/workspacesweb/identity_providers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>identity_provider</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "identity_provider_arn",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets an <code>identity_provider</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "identity_provider_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-identityprovider.html"><code>AWS::WorkSpacesWeb::IdentityProvider</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>identity_providers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IdentityProviderDetails, IdentityProviderName, IdentityProviderType, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>identity_providers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>identity_providers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>identity_providers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>identity_providers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>identity_provider</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ tags
 FROM awscc.workspacesweb.identity_providers
 WHERE region = 'us-east-1' AND data__Identifier = '<IdentityProviderArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>identity_providers</code> in a region.
+```sql
+SELECT
+region,
+identity_provider_arn
+FROM awscc.workspacesweb.identity_providers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.workspacesweb.identity_providers
+SET data__PatchDocument = string('{{ {
+    "IdentityProviderDetails": identity_provider_details,
+    "IdentityProviderName": identity_provider_name,
+    "IdentityProviderType": identity_provider_type,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IdentityProviderArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspacesweb/identity_providers_list_only/index.md b/website/docs/services/workspacesweb/identity_providers_list_only/index.md
deleted file mode 100644
index 6f200dc25..000000000
--- a/website/docs/services/workspacesweb/identity_providers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: identity_providers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - identity_providers_list_only
-  - workspacesweb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>identity_providers</code> in a region or regions, for all properties use <a href="/services/workspacesweb/identity_providers/"><code>identity_providers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>identity_providers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::WorkSpacesWeb::IdentityProvider Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.workspacesweb.identity_providers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "identity_provider_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>identity_providers</code> in a region.
-```sql
-SELECT
-region,
-identity_provider_arn
-FROM awscc.workspacesweb.identity_providers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>identity_providers_list_only</code> resource, see <a href="/services/workspacesweb/identity_providers/#permissions"><code>identity_providers</code></a>
-
diff --git a/website/docs/services/workspacesweb/index.md b/website/docs/services/workspacesweb/index.md
index 7b0e28389..542057388 100644
--- a/website/docs/services/workspacesweb/index.md
+++ b/website/docs/services/workspacesweb/index.md
@@ -20,7 +20,7 @@ The workspacesweb service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>20</b></span><br />
+<span>total resources:&nbsp;<b>10</b></span><br />
 </div>
 </div>
 
@@ -30,26 +30,16 @@ The workspacesweb service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/workspacesweb/browser_settings/">browser_settings</a><br />
-<a href="/services/workspacesweb/browser_settings_list_only/">browser_settings_list_only</a><br />
 <a href="/services/workspacesweb/data_protection_settings/">data_protection_settings</a><br />
-<a href="/services/workspacesweb/data_protection_settings_list_only/">data_protection_settings_list_only</a><br />
 <a href="/services/workspacesweb/identity_providers/">identity_providers</a><br />
-<a href="/services/workspacesweb/identity_providers_list_only/">identity_providers_list_only</a><br />
 <a href="/services/workspacesweb/ip_access_settings/">ip_access_settings</a><br />
-<a href="/services/workspacesweb/ip_access_settings_list_only/">ip_access_settings_list_only</a><br />
-<a href="/services/workspacesweb/network_settings/">network_settings</a><br />
-<a href="/services/workspacesweb/network_settings_list_only/">network_settings_list_only</a>
+<a href="/services/workspacesweb/network_settings/">network_settings</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/workspacesweb/portals/">portals</a><br />
-<a href="/services/workspacesweb/portals_list_only/">portals_list_only</a><br />
 <a href="/services/workspacesweb/session_loggers/">session_loggers</a><br />
-<a href="/services/workspacesweb/session_loggers_list_only/">session_loggers_list_only</a><br />
 <a href="/services/workspacesweb/trust_stores/">trust_stores</a><br />
-<a href="/services/workspacesweb/trust_stores_list_only/">trust_stores_list_only</a><br />
 <a href="/services/workspacesweb/user_access_logging_settings/">user_access_logging_settings</a><br />
-<a href="/services/workspacesweb/user_access_logging_settings_list_only/">user_access_logging_settings_list_only</a><br />
-<a href="/services/workspacesweb/user_settings/">user_settings</a><br />
-<a href="/services/workspacesweb/user_settings_list_only/">user_settings_list_only</a>
+<a href="/services/workspacesweb/user_settings/">user_settings</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/workspacesweb/ip_access_settings/index.md b/website/docs/services/workspacesweb/ip_access_settings/index.md
index 791a7b296..8e5f65c5a 100644
--- a/website/docs/services/workspacesweb/ip_access_settings/index.md
+++ b/website/docs/services/workspacesweb/ip_access_settings/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>ip_access_setting</code> resource or
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "additional_encryption_context",
@@ -109,6 +118,23 @@ Creates, updates, deletes or gets an <code>ip_access_setting</code> resource or
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "ip_access_settings_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-ipaccesssetting.html"><code>AWS::WorkSpacesWeb::IpAccessSettings</code></a>.
 
@@ -118,31 +144,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>ip_access_settings</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="IpRules, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>ip_access_settings</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>ip_access_settings</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>ip_access_settings_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>ip_access_settings</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -151,6 +183,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>ip_access_setting</code>.
 ```sql
 SELECT
@@ -167,6 +208,19 @@ tags
 FROM awscc.workspacesweb.ip_access_settings
 WHERE region = 'us-east-1' AND data__Identifier = '<IpAccessSettingsArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>ip_access_settings</code> in a region.
+```sql
+SELECT
+region,
+ip_access_settings_arn
+FROM awscc.workspacesweb.ip_access_settings_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -251,6 +305,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.workspacesweb.ip_access_settings
+SET data__PatchDocument = string('{{ {
+    "Description": description,
+    "DisplayName": display_name,
+    "IpRules": ip_rules,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<IpAccessSettingsArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspacesweb/ip_access_settings_list_only/index.md b/website/docs/services/workspacesweb/ip_access_settings_list_only/index.md
deleted file mode 100644
index e7b7b44c0..000000000
--- a/website/docs/services/workspacesweb/ip_access_settings_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: ip_access_settings_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - ip_access_settings_list_only
-  - workspacesweb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>ip_access_settings</code> in a region or regions, for all properties use <a href="/services/workspacesweb/ip_access_settings/"><code>ip_access_settings</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>ip_access_settings_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::WorkSpacesWeb::IpAccessSettings Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.workspacesweb.ip_access_settings_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "ip_access_settings_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>ip_access_settings</code> in a region.
-```sql
-SELECT
-region,
-ip_access_settings_arn
-FROM awscc.workspacesweb.ip_access_settings_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>ip_access_settings_list_only</code> resource, see <a href="/services/workspacesweb/ip_access_settings/#permissions"><code>ip_access_settings</code></a>
-
diff --git a/website/docs/services/workspacesweb/network_settings/index.md b/website/docs/services/workspacesweb/network_settings/index.md
index e8065ad8e..d20a2d4e9 100644
--- a/website/docs/services/workspacesweb/network_settings/index.md
+++ b/website/docs/services/workspacesweb/network_settings/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>network_setting</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "associated_portal_arns",
@@ -82,6 +91,23 @@ Creates, updates, deletes or gets a <code>network_setting</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "network_settings_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-networksetting.html"><code>AWS::WorkSpacesWeb::NetworkSettings</code></a>.
 
@@ -91,31 +117,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>network_settings</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="SecurityGroupIds, SubnetIds, VpcId, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>network_settings</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>network_settings</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>network_settings_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>network_settings</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -124,6 +156,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>network_setting</code>.
 ```sql
 SELECT
@@ -137,6 +178,19 @@ vpc_id
 FROM awscc.workspacesweb.network_settings
 WHERE region = 'us-east-1' AND data__Identifier = '<NetworkSettingsArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>network_settings</code> in a region.
+```sql
+SELECT
+region,
+network_settings_arn
+FROM awscc.workspacesweb.network_settings_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -217,6 +271,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.workspacesweb.network_settings
+SET data__PatchDocument = string('{{ {
+    "SecurityGroupIds": security_group_ids,
+    "SubnetIds": subnet_ids,
+    "Tags": tags,
+    "VpcId": vpc_id
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<NetworkSettingsArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspacesweb/network_settings_list_only/index.md b/website/docs/services/workspacesweb/network_settings_list_only/index.md
deleted file mode 100644
index 2fea8bc46..000000000
--- a/website/docs/services/workspacesweb/network_settings_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: network_settings_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - network_settings_list_only
-  - workspacesweb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>network_settings</code> in a region or regions, for all properties use <a href="/services/workspacesweb/network_settings/"><code>network_settings</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>network_settings_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::WorkSpacesWeb::NetworkSettings Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.workspacesweb.network_settings_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "network_settings_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>network_settings</code> in a region.
-```sql
-SELECT
-region,
-network_settings_arn
-FROM awscc.workspacesweb.network_settings_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>network_settings_list_only</code> resource, see <a href="/services/workspacesweb/network_settings/#permissions"><code>network_settings</code></a>
-
diff --git a/website/docs/services/workspacesweb/portals/index.md b/website/docs/services/workspacesweb/portals/index.md
index 9a313a875..a8c661888 100644
--- a/website/docs/services/workspacesweb/portals/index.md
+++ b/website/docs/services/workspacesweb/portals/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>portal</code> resource or lists <code>
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "additional_encryption_context",
@@ -167,6 +176,23 @@ Creates, updates, deletes or gets a <code>portal</code> resource or lists <code>
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "portal_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-portal.html"><code>AWS::WorkSpacesWeb::Portal</code></a>.
 
@@ -176,31 +202,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>portals</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>portals</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>portals</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>portals_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>portals</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -209,6 +241,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>portal</code>.
 ```sql
 SELECT
@@ -239,6 +280,19 @@ user_settings_arn
 FROM awscc.workspacesweb.portals
 WHERE region = 'us-east-1' AND data__Identifier = '<PortalArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>portals</code> in a region.
+```sql
+SELECT
+region,
+portal_arn
+FROM awscc.workspacesweb.portals_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -385,6 +439,31 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.workspacesweb.portals
+SET data__PatchDocument = string('{{ {
+    "AuthenticationType": authentication_type,
+    "BrowserSettingsArn": browser_settings_arn,
+    "DataProtectionSettingsArn": data_protection_settings_arn,
+    "DisplayName": display_name,
+    "InstanceType": instance_type,
+    "IpAccessSettingsArn": ip_access_settings_arn,
+    "MaxConcurrentSessions": max_concurrent_sessions,
+    "NetworkSettingsArn": network_settings_arn,
+    "SessionLoggerArn": session_logger_arn,
+    "Tags": tags,
+    "TrustStoreArn": trust_store_arn,
+    "UserAccessLoggingSettingsArn": user_access_logging_settings_arn,
+    "UserSettingsArn": user_settings_arn
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PortalArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspacesweb/portals_list_only/index.md b/website/docs/services/workspacesweb/portals_list_only/index.md
deleted file mode 100644
index b09b1349f..000000000
--- a/website/docs/services/workspacesweb/portals_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: portals_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - portals_list_only
-  - workspacesweb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>portals</code> in a region or regions, for all properties use <a href="/services/workspacesweb/portals/"><code>portals</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>portals_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::WorkSpacesWeb::Portal Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.workspacesweb.portals_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "portal_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>portals</code> in a region.
-```sql
-SELECT
-region,
-portal_arn
-FROM awscc.workspacesweb.portals_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>portals_list_only</code> resource, see <a href="/services/workspacesweb/portals/#permissions"><code>portals</code></a>
-
diff --git a/website/docs/services/workspacesweb/session_loggers/index.md b/website/docs/services/workspacesweb/session_loggers/index.md
index 2cbc49785..c3bb85195 100644
--- a/website/docs/services/workspacesweb/session_loggers/index.md
+++ b/website/docs/services/workspacesweb/session_loggers/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>session_logger</code> resource or list
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "additional_encryption_context",
@@ -131,6 +140,23 @@ Creates, updates, deletes or gets a <code>session_logger</code> resource or list
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "session_logger_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-sessionlogger.html"><code>AWS::WorkSpacesWeb::SessionLogger</code></a>.
 
@@ -140,31 +166,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>session_loggers</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="EventFilter, LogConfiguration, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>session_loggers</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>session_loggers</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>session_loggers_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>session_loggers</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -173,6 +205,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>session_logger</code>.
 ```sql
 SELECT
@@ -189,6 +230,19 @@ tags
 FROM awscc.workspacesweb.session_loggers
 WHERE region = 'us-east-1' AND data__Identifier = '<SessionLoggerArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>session_loggers</code> in a region.
+```sql
+SELECT
+region,
+session_logger_arn
+FROM awscc.workspacesweb.session_loggers_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -279,6 +333,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.workspacesweb.session_loggers
+SET data__PatchDocument = string('{{ {
+    "DisplayName": display_name,
+    "EventFilter": event_filter,
+    "LogConfiguration": log_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<SessionLoggerArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspacesweb/session_loggers_list_only/index.md b/website/docs/services/workspacesweb/session_loggers_list_only/index.md
deleted file mode 100644
index e4037fbb6..000000000
--- a/website/docs/services/workspacesweb/session_loggers_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: session_loggers_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - session_loggers_list_only
-  - workspacesweb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>session_loggers</code> in a region or regions, for all properties use <a href="/services/workspacesweb/session_loggers/"><code>session_loggers</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>session_loggers_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::WorkSpacesWeb::SessionLogger Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.workspacesweb.session_loggers_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "session_logger_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>session_loggers</code> in a region.
-```sql
-SELECT
-region,
-session_logger_arn
-FROM awscc.workspacesweb.session_loggers_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>session_loggers_list_only</code> resource, see <a href="/services/workspacesweb/session_loggers/#permissions"><code>session_loggers</code></a>
-
diff --git a/website/docs/services/workspacesweb/trust_stores/index.md b/website/docs/services/workspacesweb/trust_stores/index.md
index 557df3b99..1f68beb88 100644
--- a/website/docs/services/workspacesweb/trust_stores/index.md
+++ b/website/docs/services/workspacesweb/trust_stores/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>trust_store</code> resource or lists <
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "associated_portal_arns",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets a <code>trust_store</code> resource or lists <
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "trust_store_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-truststore.html"><code>AWS::WorkSpacesWeb::TrustStore</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>trust_stores</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CertificateList, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>trust_stores</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>trust_stores</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>trust_stores_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>trust_stores</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>trust_store</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ trust_store_arn
 FROM awscc.workspacesweb.trust_stores
 WHERE region = 'us-east-1' AND data__Identifier = '<TrustStoreArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>trust_stores</code> in a region.
+```sql
+SELECT
+region,
+trust_store_arn
+FROM awscc.workspacesweb.trust_stores_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -192,6 +246,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.workspacesweb.trust_stores
+SET data__PatchDocument = string('{{ {
+    "CertificateList": certificate_list,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<TrustStoreArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspacesweb/trust_stores_list_only/index.md b/website/docs/services/workspacesweb/trust_stores_list_only/index.md
deleted file mode 100644
index c73f37faa..000000000
--- a/website/docs/services/workspacesweb/trust_stores_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: trust_stores_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - trust_stores_list_only
-  - workspacesweb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>trust_stores</code> in a region or regions, for all properties use <a href="/services/workspacesweb/trust_stores/"><code>trust_stores</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>trust_stores_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::WorkSpacesWeb::TrustStore Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.workspacesweb.trust_stores_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "trust_store_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>trust_stores</code> in a region.
-```sql
-SELECT
-region,
-trust_store_arn
-FROM awscc.workspacesweb.trust_stores_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>trust_stores_list_only</code> resource, see <a href="/services/workspacesweb/trust_stores/#permissions"><code>trust_stores</code></a>
-
diff --git a/website/docs/services/workspacesweb/user_access_logging_settings/index.md b/website/docs/services/workspacesweb/user_access_logging_settings/index.md
index f95b85670..fc6b91de2 100644
--- a/website/docs/services/workspacesweb/user_access_logging_settings/index.md
+++ b/website/docs/services/workspacesweb/user_access_logging_settings/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>user_access_logging_setting</code> re
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "associated_portal_arns",
@@ -72,6 +81,23 @@ Creates, updates, deletes or gets an <code>user_access_logging_setting</code> re
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "user_access_logging_settings_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-useraccessloggingsetting.html"><code>AWS::WorkSpacesWeb::UserAccessLoggingSettings</code></a>.
 
@@ -81,31 +107,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>user_access_logging_settings</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="KinesisStreamArn, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>user_access_logging_settings</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>user_access_logging_settings</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>user_access_logging_settings_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>user_access_logging_settings</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -114,6 +146,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user_access_logging_setting</code>.
 ```sql
 SELECT
@@ -125,6 +166,19 @@ user_access_logging_settings_arn
 FROM awscc.workspacesweb.user_access_logging_settings
 WHERE region = 'us-east-1' AND data__Identifier = '<UserAccessLoggingSettingsArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>user_access_logging_settings</code> in a region.
+```sql
+SELECT
+region,
+user_access_logging_settings_arn
+FROM awscc.workspacesweb.user_access_logging_settings_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -191,6 +245,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.workspacesweb.user_access_logging_settings
+SET data__PatchDocument = string('{{ {
+    "KinesisStreamArn": kinesis_stream_arn,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserAccessLoggingSettingsArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspacesweb/user_access_logging_settings_list_only/index.md b/website/docs/services/workspacesweb/user_access_logging_settings_list_only/index.md
deleted file mode 100644
index a1fef72bf..000000000
--- a/website/docs/services/workspacesweb/user_access_logging_settings_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: user_access_logging_settings_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - user_access_logging_settings_list_only
-  - workspacesweb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>user_access_logging_settings</code> in a region or regions, for all properties use <a href="/services/workspacesweb/user_access_logging_settings/"><code>user_access_logging_settings</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>user_access_logging_settings_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::WorkSpacesWeb::UserAccessLoggingSettings Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.workspacesweb.user_access_logging_settings_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "user_access_logging_settings_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>user_access_logging_settings</code> in a region.
-```sql
-SELECT
-region,
-user_access_logging_settings_arn
-FROM awscc.workspacesweb.user_access_logging_settings_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>user_access_logging_settings_list_only</code> resource, see <a href="/services/workspacesweb/user_access_logging_settings/#permissions"><code>user_access_logging_settings</code></a>
-
diff --git a/website/docs/services/workspacesweb/user_settings/index.md b/website/docs/services/workspacesweb/user_settings/index.md
index cc1ee6712..1104f6e1f 100644
--- a/website/docs/services/workspacesweb/user_settings/index.md
+++ b/website/docs/services/workspacesweb/user_settings/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets an <code>user_setting</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "additional_encryption_context",
@@ -153,6 +162,23 @@ Creates, updates, deletes or gets an <code>user_setting</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "user_settings_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-usersetting.html"><code>AWS::WorkSpacesWeb::UserSettings</code></a>.
 
@@ -162,31 +188,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>user_settings</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="CopyAllowed, DownloadAllowed, PasteAllowed, PrintAllowed, UploadAllowed, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>user_settings</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>user_settings</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>user_settings_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>user_settings</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -195,6 +227,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>user_setting</code>.
 ```sql
 SELECT
@@ -217,6 +258,19 @@ deep_link_allowed
 FROM awscc.workspacesweb.user_settings
 WHERE region = 'us-east-1' AND data__Identifier = '<UserSettingsArn>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>user_settings</code> in a region.
+```sql
+SELECT
+region,
+user_settings_arn
+FROM awscc.workspacesweb.user_settings_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -346,6 +400,31 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.workspacesweb.user_settings
+SET data__PatchDocument = string('{{ {
+    "AdditionalEncryptionContext": additional_encryption_context,
+    "CookieSynchronizationConfiguration": cookie_synchronization_configuration,
+    "CopyAllowed": copy_allowed,
+    "CustomerManagedKey": customer_managed_key,
+    "DisconnectTimeoutInMinutes": disconnect_timeout_in_minutes,
+    "DownloadAllowed": download_allowed,
+    "IdleDisconnectTimeoutInMinutes": idle_disconnect_timeout_in_minutes,
+    "PasteAllowed": paste_allowed,
+    "PrintAllowed": print_allowed,
+    "Tags": tags,
+    "ToolbarConfiguration": toolbar_configuration,
+    "UploadAllowed": upload_allowed,
+    "DeepLinkAllowed": deep_link_allowed
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<UserSettingsArn>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/workspacesweb/user_settings_list_only/index.md b/website/docs/services/workspacesweb/user_settings_list_only/index.md
deleted file mode 100644
index d1eb0172d..000000000
--- a/website/docs/services/workspacesweb/user_settings_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: user_settings_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - user_settings_list_only
-  - workspacesweb
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>user_settings</code> in a region or regions, for all properties use <a href="/services/workspacesweb/user_settings/"><code>user_settings</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>user_settings_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>Definition of AWS::WorkSpacesWeb::UserSettings Resource Type</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.workspacesweb.user_settings_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "user_settings_arn",
-    "type": "string",
-    "description": ""
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>user_settings</code> in a region.
-```sql
-SELECT
-region,
-user_settings_arn
-FROM awscc.workspacesweb.user_settings_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>user_settings_list_only</code> resource, see <a href="/services/workspacesweb/user_settings/#permissions"><code>user_settings</code></a>
-
diff --git a/website/docs/services/xray/groups/index.md b/website/docs/services/xray/groups/index.md
index 61bcf0b24..064e2a3d7 100644
--- a/website/docs/services/xray/groups/index.md
+++ b/website/docs/services/xray/groups/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>group</code> resource or lists <code>g
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "filter_expression",
@@ -89,6 +98,23 @@ Creates, updates, deletes or gets a <code>group</code> resource or lists <code>g
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "group_arn",
+    "type": "string",
+    "description": "The ARN of the group that was generated on creation."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-xray-group.html"><code>AWS::XRay::Group</code></a>.
 
@@ -98,31 +124,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="GroupName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>groups_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>groups</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -131,6 +163,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>group</code>.
 ```sql
 SELECT
@@ -143,6 +184,19 @@ tags
 FROM awscc.xray.groups
 WHERE region = 'us-east-1' AND data__Identifier = '<GroupARN>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>groups</code> in a region.
+```sql
+SELECT
+region,
+group_arn
+FROM awscc.xray.groups_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -219,6 +273,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.xray.groups
+SET data__PatchDocument = string('{{ {
+    "FilterExpression": filter_expression,
+    "GroupName": group_name,
+    "InsightsConfiguration": insights_configuration,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<GroupARN>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/xray/groups_list_only/index.md b/website/docs/services/xray/groups_list_only/index.md
deleted file mode 100644
index 7ad592f0c..000000000
--- a/website/docs/services/xray/groups_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: groups_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - groups_list_only
-  - xray
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>groups</code> in a region or regions, for all properties use <a href="/services/xray/groups/"><code>groups</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>groups_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This schema provides construct and validation rules for AWS-XRay Group resource parameters.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.xray.groups_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "group_arn",
-    "type": "string",
-    "description": "The ARN of the group that was generated on creation."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>groups</code> in a region.
-```sql
-SELECT
-region,
-group_arn
-FROM awscc.xray.groups_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>groups_list_only</code> resource, see <a href="/services/xray/groups/#permissions"><code>groups</code></a>
-
diff --git a/website/docs/services/xray/index.md b/website/docs/services/xray/index.md
index 614fe8d5d..9e3f989ad 100644
--- a/website/docs/services/xray/index.md
+++ b/website/docs/services/xray/index.md
@@ -20,7 +20,7 @@ The xray service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>8</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -30,14 +30,10 @@ The xray service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/xray/groups/">groups</a><br />
-<a href="/services/xray/groups_list_only/">groups_list_only</a><br />
-<a href="/services/xray/resource_policies/">resource_policies</a><br />
-<a href="/services/xray/resource_policies_list_only/">resource_policies_list_only</a>
+<a href="/services/xray/resource_policies/">resource_policies</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/xray/sampling_rules/">sampling_rules</a><br />
-<a href="/services/xray/sampling_rules_list_only/">sampling_rules_list_only</a><br />
-<a href="/services/xray/transaction_search_configs/">transaction_search_configs</a><br />
-<a href="/services/xray/transaction_search_configs_list_only/">transaction_search_configs_list_only</a>
+<a href="/services/xray/transaction_search_configs/">transaction_search_configs</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/xray/resource_policies/index.md b/website/docs/services/xray/resource_policies/index.md
index ff278f1c0..5efd4173f 100644
--- a/website/docs/services/xray/resource_policies/index.md
+++ b/website/docs/services/xray/resource_policies/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>resource_policy</code> resource or lis
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "policy_name",
@@ -55,6 +64,23 @@ Creates, updates, deletes or gets a <code>resource_policy</code> resource or lis
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "policy_name",
+    "type": "string",
+    "description": "The name of the resource policy. Must be unique within a specific AWS account."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-xray-resourcepolicy.html"><code>AWS::XRay::ResourcePolicy</code></a>.
 
@@ -64,31 +90,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="PolicyName, PolicyDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>resource_policies_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>resource_policies</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -97,6 +129,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>resource_policy</code>.
 ```sql
 SELECT
@@ -107,6 +148,19 @@ bypass_policy_lockout_check
 FROM awscc.xray.resource_policies
 WHERE region = 'us-east-1' AND data__Identifier = '<PolicyName>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>resource_policies</code> in a region.
+```sql
+SELECT
+region,
+policy_name
+FROM awscc.xray.resource_policies_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -177,6 +231,20 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.xray.resource_policies
+SET data__PatchDocument = string('{{ {
+    "PolicyDocument": policy_document,
+    "BypassPolicyLockoutCheck": bypass_policy_lockout_check
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<PolicyName>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/xray/resource_policies_list_only/index.md b/website/docs/services/xray/resource_policies_list_only/index.md
deleted file mode 100644
index 061f1ba2b..000000000
--- a/website/docs/services/xray/resource_policies_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: resource_policies_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - resource_policies_list_only
-  - xray
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>resource_policies</code> in a region or regions, for all properties use <a href="/services/xray/resource_policies/"><code>resource_policies</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>resource_policies_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This schema provides construct and validation rules for AWS-XRay Resource Policy resource parameters.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.xray.resource_policies_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "policy_name",
-    "type": "string",
-    "description": "The name of the resource policy. Must be unique within a specific AWS account."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>resource_policies</code> in a region.
-```sql
-SELECT
-region,
-policy_name
-FROM awscc.xray.resource_policies_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>resource_policies_list_only</code> resource, see <a href="/services/xray/resource_policies/#permissions"><code>resource_policies</code></a>
-
diff --git a/website/docs/services/xray/sampling_rules/index.md b/website/docs/services/xray/sampling_rules/index.md
index e1a393ba5..8788fb0c0 100644
--- a/website/docs/services/xray/sampling_rules/index.md
+++ b/website/docs/services/xray/sampling_rules/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>sampling_rule</code> resource or lists
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "sampling_rule",
@@ -269,6 +278,23 @@ Creates, updates, deletes or gets a <code>sampling_rule</code> resource or lists
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "rule_arn",
+    "type": "string",
+    "description": "The ARN of the sampling rule. Specify a rule by either name or ARN, but not both."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-xray-samplingrule.html"><code>AWS::XRay::SamplingRule</code></a>.
 
@@ -278,31 +304,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>sampling_rules</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>sampling_rules</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>sampling_rules</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>sampling_rules_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>sampling_rules</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -311,6 +343,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>sampling_rule</code>.
 ```sql
 SELECT
@@ -324,6 +365,19 @@ tags
 FROM awscc.xray.sampling_rules
 WHERE region = 'us-east-1' AND data__Identifier = '<RuleARN>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>sampling_rules</code> in a region.
+```sql
+SELECT
+region,
+rule_arn
+FROM awscc.xray.sampling_rules_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -430,6 +484,22 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.xray.sampling_rules
+SET data__PatchDocument = string('{{ {
+    "SamplingRuleRecord": sampling_rule_record,
+    "SamplingRuleUpdate": sampling_rule_update,
+    "RuleName": rule_name,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<RuleARN>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/xray/sampling_rules_list_only/index.md b/website/docs/services/xray/sampling_rules_list_only/index.md
deleted file mode 100644
index d8802b06b..000000000
--- a/website/docs/services/xray/sampling_rules_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: sampling_rules_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - sampling_rules_list_only
-  - xray
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>sampling_rules</code> in a region or regions, for all properties use <a href="/services/xray/sampling_rules/"><code>sampling_rules</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>sampling_rules_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This schema provides construct and validation rules for AWS-XRay SamplingRule resource parameters.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.xray.sampling_rules_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "rule_arn",
-    "type": "string",
-    "description": "The ARN of the sampling rule. Specify a rule by either name or ARN, but not both."
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>sampling_rules</code> in a region.
-```sql
-SELECT
-region,
-rule_arn
-FROM awscc.xray.sampling_rules_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>sampling_rules_list_only</code> resource, see <a href="/services/xray/sampling_rules/#permissions"><code>sampling_rules</code></a>
-
diff --git a/website/docs/services/xray/transaction_search_configs/index.md b/website/docs/services/xray/transaction_search_configs/index.md
index f16182f13..ccd781d04 100644
--- a/website/docs/services/xray/transaction_search_configs/index.md
+++ b/website/docs/services/xray/transaction_search_configs/index.md
@@ -33,6 +33,15 @@ Creates, updates, deletes or gets a <code>transaction_search_config</code> resou
 </table>
 
 ## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 <SchemaTable fields={[
   {
     "name": "account_id",
@@ -50,6 +59,23 @@ Creates, updates, deletes or gets a <code>transaction_search_config</code> resou
     "description": "AWS region."
   }
 ]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "account_id",
+    "type": "string",
+    "description": "User account id, used as the primary identifier for the resource"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
 
 For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-xray-transactionsearchconfig.html"><code>AWS::XRay::TransactionSearchConfig</code></a>.
 
@@ -59,31 +85,37 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 <tbody>
   <tr>
     <th>Name</th>
+    <th>Resource</th>
     <th>Accessible by</th>
     <th>Required Params</th>
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
+    <td><code>transaction_search_configs</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
+    <td><code>transaction_search_configs</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
+    <td><code>transaction_search_configs</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="data__Identifier, data__PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
+    <td><code>transaction_search_configs_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
+    <td><code>transaction_search_configs</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="data__Identifier, region" /></td>
   </tr>
@@ -92,6 +124,15 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
 
 ## `SELECT` examples
 
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
 Gets all properties from an individual <code>transaction_search_config</code>.
 ```sql
 SELECT
@@ -101,6 +142,19 @@ indexing_percentage
 FROM awscc.xray.transaction_search_configs
 WHERE region = 'us-east-1' AND data__Identifier = '<AccountId>';
 ```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>transaction_search_configs</code> in a region.
+```sql
+SELECT
+region,
+account_id
+FROM awscc.xray.transaction_search_configs_list_only
+WHERE region = 'us-east-1';
+```
+</TabItem>
+</Tabs>
 
 ## `INSERT` example
 
@@ -161,6 +215,19 @@ resources:
 </TabItem>
 </Tabs>
 
+## `UPDATE` example
+
+```sql
+/*+ update */
+UPDATE awscc.xray.transaction_search_configs
+SET data__PatchDocument = string('{{ {
+    "IndexingPercentage": indexing_percentage
+} | generate_patch_document }}')
+WHERE region = '{{ region }}'
+AND data__Identifier = '<AccountId>';
+```
+
+
 ## `DELETE` example
 
 ```sql
diff --git a/website/docs/services/xray/transaction_search_configs_list_only/index.md b/website/docs/services/xray/transaction_search_configs_list_only/index.md
deleted file mode 100644
index 7ba4aa1ef..000000000
--- a/website/docs/services/xray/transaction_search_configs_list_only/index.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: transaction_search_configs_list_only
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - transaction_search_configs_list_only
-  - xray
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
-
-Lists <code>transaction_search_configs</code> in a region or regions, for all properties use <a href="/services/xray/transaction_search_configs/"><code>transaction_search_configs</code></a>
-
-## Overview
-<table>
-<tbody>
-<tr><td><b>Name</b></td><td><code>transaction_search_configs_list_only</code></td></tr>
-<tr><td><b>Type</b></td><td>Resource</td></tr>
-<tr><td><b>Description</b></td><td>This schema provides construct and validation rules for AWS-XRay TransactionSearchConfig resource parameters.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.xray.transaction_search_configs_list_only" /></td></tr>
-</tbody>
-</table>
-
-## Fields
-<SchemaTable fields={[
-  {
-    "name": "account_id",
-    "type": "string",
-    "description": "User account id, used as the primary identifier for the resource"
-  },
-  {
-    "name": "region",
-    "type": "string",
-    "description": "AWS region."
-  }
-]} />
-
-## Methods
-
-<table>
-<tbody>
-  <tr>
-    <th>Name</th>
-    <th>Accessible by</th>
-    <th>Required Params</th>
-  </tr>
-  <tr>
-    <td><CopyableCode code="list_resources" /></td>
-    <td><code>SELECT</code></td>
-    <td><CopyableCode code="region" /></td>
-  </tr>
-</tbody>
-</table>
-
-## `SELECT` examples
-Lists all <code>transaction_search_configs</code> in a region.
-```sql
-SELECT
-region,
-account_id
-FROM awscc.xray.transaction_search_configs_list_only
-WHERE region = 'us-east-1';
-```
-
-
-## Permissions
-
-For permissions required to operate on the <code>transaction_search_configs_list_only</code> resource, see <a href="/services/xray/transaction_search_configs/#permissions"><code>transaction_search_configs</code></a>
-
diff --git a/website/src/components/StackqlDeployDropdown/StackqlDeployDropdown.js b/website/src/components/StackqlDeployDropdown/StackqlDeployDropdown.js
new file mode 100644
index 000000000..7bd4d8751
--- /dev/null
+++ b/website/src/components/StackqlDeployDropdown/StackqlDeployDropdown.js
@@ -0,0 +1,387 @@
+import React, { useState } from 'react';
+import Button from '@mui/material/Button';
+import Menu from '@mui/material/Menu';
+import MenuItem from '@mui/material/MenuItem';
+import ListItemIcon from '@mui/material/ListItemIcon';
+import ListItemText from '@mui/material/ListItemText';
+import DownloadIcon from '@mui/icons-material/Download';
+import ContentCopyIcon from '@mui/icons-material/ContentCopy';
+import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
+import {useLocation} from '@docusaurus/router';
+import styles from './StackqlDeployDropdown.module.css';
+
+/**
+ * Collects all DOM elements between a heading and the next <h2>.
+ */
+function getElementsBetweenHeadings(heading) {
+  const elements = [];
+  let el = heading.nextElementSibling;
+  while (el && el.tagName !== 'H2') {
+    elements.push(el);
+    el = el.nextElementSibling;
+  }
+  return elements;
+}
+
+/**
+ * Extracts text from a <code> element, preserving newlines.
+ * prism-react-renderer wraps each line in a child element (div or span),
+ * and textContent concatenates them without newlines, so we join manually.
+ */
+function getCodeText(codeEl) {
+  if (codeEl.children.length > 0) {
+    return Array.from(codeEl.children)
+      .map(line => line.textContent.replace(/\n$/, ''))
+      .join('\n');
+  }
+  return codeEl.textContent;
+}
+
+/**
+ * Extracts the text content of a code block from within a set of elements.
+ * If preferredTab is provided, looks for a tab with that label first.
+ */
+function extractCodeFromElements(elements, preferredTab) {
+  if (preferredTab) {
+    for (const el of elements) {
+      const tabs = el.querySelectorAll('[role="tab"]');
+      const panels = el.querySelectorAll('[role="tabpanel"]');
+      for (let i = 0; i < tabs.length; i++) {
+        const tabLabel = tabs[i].textContent.trim().toLowerCase();
+        if (tabLabel === preferredTab.toLowerCase() && panels[i]) {
+          const codeEl = panels[i].querySelector('pre code');
+          if (codeEl) return getCodeText(codeEl);
+        }
+      }
+    }
+  }
+  // Fallback: first code block in the section
+  for (const el of elements) {
+    const codeEl = el.querySelector('pre code');
+    if (codeEl) return getCodeText(codeEl);
+  }
+  return null;
+}
+
+/**
+ * Scans the rendered page DOM for SQL example sections and extracts
+ * code blocks to build a context-aware stackql-deploy template.
+ *
+ * Section heading IDs generated by Docusaurus:
+ *   ## `SELECT` examples  -> #select-examples
+ *   ## `INSERT` examples  -> #insert-examples
+ *   ## `UPDATE` examples  -> #update-examples
+ *   ## `REPLACE` examples -> #replace-examples
+ *   ## `DELETE` examples  -> #delete-examples
+ *   ## Lifecycle Methods   -> #lifecycle-methods
+ */
+function extractTemplateFromPage() {
+  const sections = {};
+
+  // --- SELECT (prefer "get" tab for a single-resource check) ---
+  const selectH2 = document.getElementById('select-examples');
+  if (selectH2) {
+    const els = getElementsBetweenHeadings(selectH2);
+    sections.select = extractCodeFromElements(els, 'get (all properties)')
+                   || extractCodeFromElements(els, 'get')
+                   || extractCodeFromElements(els);
+  }
+
+  // --- INSERT (prefer "create" tab -- skip "Manifest" yaml tab) ---
+  const insertH2 = document.getElementById('insert-examples') || document.getElementById('insert-example');
+  if (insertH2) {
+    const els = getElementsBetweenHeadings(insertH2);
+    sections.insert = extractCodeFromElements(els, 'Required Properties')
+                   || extractCodeFromElements(els, 'create')
+                   || extractCodeFromElements(els);
+  }
+
+  // --- UPDATE ---
+  const updateH2 = document.getElementById('update-examples') || document.getElementById('update-example');
+  if (updateH2) {
+    const els = getElementsBetweenHeadings(updateH2);
+    sections.update = extractCodeFromElements(els);
+  }
+
+  // --- REPLACE ---
+  const replaceH2 = document.getElementById('replace-examples');
+  if (replaceH2) {
+    const els = getElementsBetweenHeadings(replaceH2);
+    sections.replace = extractCodeFromElements(els);
+  }
+
+  // --- DELETE (standalone section) ---
+  const deleteH2 = document.getElementById('delete-examples') || document.getElementById('delete-example');
+  if (deleteH2) {
+    const els = getElementsBetweenHeadings(deleteH2);
+    sections.delete = extractCodeFromElements(els);
+  }
+
+  // --- Lifecycle Methods: look for a "delete" tab if no standalone DELETE ---
+  if (!sections.delete) {
+    const lifecycleH2 = document.getElementById('lifecycle-methods');
+    if (lifecycleH2) {
+      const els = getElementsBetweenHeadings(lifecycleH2);
+      sections.delete = extractCodeFromElements(els, 'delete');
+    }
+  }
+
+  return sections;
+}
+
+/**
+ * Parses a SELECT SQL string into its components:
+ *   fields  - column names from the SELECT list
+ *   table   - fully-qualified table reference after FROM
+ *   where   - the raw WHERE clause (conditions only, no leading WHERE)
+ */
+function parseSelectSQL(sql) {
+  const selectFromMatch = sql.match(/SELECT\s+([\s\S]+?)\s+FROM\s+/i);
+  const fromMatch = sql.match(/FROM\s+(\S+)/i);
+  const whereMatch = sql.match(/WHERE\s+([\s\S]+?)(?:\s*;\s*$|$)/i);
+
+  const fields = selectFromMatch
+    ? selectFromMatch[1]
+        .split(',')
+        .map(f => f.trim())
+        .filter(f => f && f !== '*')
+    : [];
+
+  const table = fromMatch ? fromMatch[1] : '';
+  const where = whereMatch ? whereMatch[1].trim().replace(/;\s*$/, '').trim() : '';
+
+  return { fields, table, where };
+}
+
+// Parses column names from an INSERT INTO ... (...) statement
+// and returns the base field names (stripping data__ prefix).
+function parseInsertColumns(sql) {
+  const match = sql.match(/INSERT\s+INTO\s+\S+\s*\(([\s\S]+?)\)/i);
+  if (!match) return [];
+  return match[1]
+    .split(',')
+    .map(c => c.trim().replace(/^data__/, ''))
+    .filter(Boolean);
+}
+
+// Builds an "exists" hint query - a simplified count query using only the
+// original WHERE params (required parameters from the page).
+function buildExistsQuery(parsed) {
+  let sql = `SELECT count(*) as count\nFROM ${parsed.table}`;
+  if (parsed.where) {
+    sql += `\nWHERE ${parsed.where}`;
+  }
+  sql += '\n;';
+  return sql;
+}
+
+// Builds a "statecheck" hint query - a count query where SELECT fields become
+// equality checks in the WHERE clause, followed by the original WHERE params.
+function buildStatecheckQuery(parsed) {
+  const fieldConditions = parsed.fields
+    .map(f => `${f} = {{ ${f} }}`)
+    .join(' AND\n');
+
+  let whereClause = fieldConditions;
+  if (parsed.where) {
+    if (whereClause) {
+      whereClause += ' AND\n';
+    }
+    whereClause += parsed.where;
+  }
+
+  let sql = `SELECT count(*) as count\nFROM ${parsed.table}`;
+  if (whereClause) {
+    sql += `\nWHERE \n${whereClause}`;
+  }
+  sql += '\n;';
+  return sql;
+}
+
+/**
+ * Builds the stackql-deploy IQL template from extracted sections.
+ * Only includes anchors for operations that actually exist on the page.
+ */
+function buildTemplate(sections) {
+  const parts = [];
+  let parsed = null;
+
+  if (sections.select) {
+    parsed = parseSelectSQL(sections.select);
+    parts.push(`/*+ exists */\n${buildExistsQuery(parsed)}`);
+  }
+
+  if (sections.insert) {
+    parts.push(`/*+ createorupdate */\n${sections.insert}`);
+  } else if (sections.update) {
+    parts.push(`/*+ createorupdate */\n${sections.update}`);
+  } else if (sections.replace) {
+    parts.push(`/*+ createorupdate */\n${sections.replace}`);
+  }
+
+  if (parsed) {
+    // If INSERT exists, narrow to mutable fields only (skip created_at, etc.)
+    let mutableParsed = parsed;
+    if (sections.insert) {
+      const insertColSet = new Set(parseInsertColumns(sections.insert));
+      const mutableFields = parsed.fields.filter(f => insertColSet.has(f));
+      if (mutableFields.length > 0) {
+        mutableParsed = { ...parsed, fields: mutableFields };
+      }
+    }
+
+    parts.push(`/*+ statecheck, retries=5, retry_delay=10 */\n${buildStatecheckQuery(mutableParsed)}`);
+
+    // Build exports SELECT with only mutable fields
+    let exportsSql = `SELECT ${mutableParsed.fields.join(',\n')}\nFROM ${parsed.table}`;
+    if (parsed.where) {
+      exportsSql += `\nWHERE ${parsed.where}`;
+    }
+    exportsSql += '\n;';
+    parts.push(`/*+ exports */\n${exportsSql}`);
+  }
+
+  if (sections.delete) {
+    parts.push(`/*+ delete */\n${sections.delete}`);
+  }
+
+  return parts.join('\n\n');
+}
+
+function getResourceName(pathname) {
+  const match = pathname.match(/\/services\/[^/]+\/([^/]+)/);
+  return match ? match[1] : null;
+}
+
+export default function StackqlDeployDropdown() {
+  const [anchorEl, setAnchorEl] = useState(null);
+  const [copied, setCopied] = useState(false);
+  const open = Boolean(anchorEl);
+  const location = useLocation();
+
+  const resourceName = getResourceName(location.pathname);
+
+  // Only render on resource pages (URL: /services/{service}/{resource})
+  if (!resourceName) return null;
+
+  const filename = `${resourceName}.iql`;
+
+  function getTemplate() {
+    const sections = extractTemplateFromPage();
+    return buildTemplate(sections);
+  }
+
+  const handleClick = (event) => {
+    setAnchorEl(event.currentTarget);
+  };
+
+  const handleClose = () => {
+    setAnchorEl(null);
+  };
+
+  const handleDownload = () => {
+    const template = getTemplate();
+    if (!template) {
+      handleClose();
+      return;
+    }
+    const blob = new Blob([template], { type: 'text/plain' });
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement('a');
+    a.href = url;
+    a.download = filename;
+    document.body.appendChild(a);
+    a.click();
+    document.body.removeChild(a);
+    URL.revokeObjectURL(url);
+    handleClose();
+  };
+
+  const handleCopy = async () => {
+    const template = getTemplate();
+    if (!template) {
+      handleClose();
+      return;
+    }
+    try {
+      await navigator.clipboard.writeText(template);
+      setCopied(true);
+      setTimeout(() => setCopied(false), 2000);
+    } catch {
+      const textarea = document.createElement('textarea');
+      textarea.value = template;
+      document.body.appendChild(textarea);
+      textarea.select();
+      document.execCommand('copy');
+      document.body.removeChild(textarea);
+      setCopied(true);
+      setTimeout(() => setCopied(false), 2000);
+    }
+    handleClose();
+  };
+
+  return (
+    <div className={styles.dropdownWrapper}>
+      <Button
+        variant="outlined"
+        size="small"
+        endIcon={<KeyboardArrowDownIcon />}
+        onClick={handleClick}
+        sx={{
+          textTransform: 'none',
+          fontFamily: 'var(--ifm-font-family-base)',
+          fontWeight: 600,
+          fontSize: '0.75rem',
+          borderColor: 'var(--ifm-color-primary)',
+          color: 'var(--ifm-color-primary)',
+          '&:hover': {
+            borderColor: 'var(--ifm-color-primary)',
+            backgroundColor: 'rgba(0, 65, 101, 0.04)',
+          },
+        }}
+      >
+        stackql-deploy Template
+      </Button>
+      <Menu
+        anchorEl={anchorEl}
+        open={open}
+        onClose={handleClose}
+        anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
+        transformOrigin={{ vertical: 'top', horizontal: 'right' }}
+        sx={{
+          '& .MuiPaper-root': {
+            fontFamily: 'var(--ifm-font-family-base)',
+            minWidth: 180,
+          },
+        }}
+      >
+        <MenuItem onClick={handleDownload}>
+          <ListItemIcon>
+            <DownloadIcon fontSize="small" />
+          </ListItemIcon>
+          <ListItemText
+            primaryTypographyProps={{
+              fontSize: '0.85rem',
+              fontFamily: 'var(--ifm-font-family-base)',
+            }}
+          >
+            Download
+          </ListItemText>
+        </MenuItem>
+        <MenuItem onClick={handleCopy}>
+          <ListItemIcon>
+            <ContentCopyIcon fontSize="small" />
+          </ListItemIcon>
+          <ListItemText
+            primaryTypographyProps={{
+              fontSize: '0.85rem',
+              fontFamily: 'var(--ifm-font-family-base)',
+            }}
+          >
+            {copied ? 'Copied!' : 'Copy'}
+          </ListItemText>
+        </MenuItem>
+      </Menu>
+    </div>
+  );
+}
diff --git a/website/src/components/StackqlDeployDropdown/StackqlDeployDropdown.module.css b/website/src/components/StackqlDeployDropdown/StackqlDeployDropdown.module.css
new file mode 100644
index 000000000..c63460e3c
--- /dev/null
+++ b/website/src/components/StackqlDeployDropdown/StackqlDeployDropdown.module.css
@@ -0,0 +1,12 @@
+/* Only show on md+ viewports (Docusaurus default breakpoint: 996px) */
+.dropdownWrapper {
+  display: none;
+  flex-shrink: 0;
+}
+
+@media screen and (min-width: 997px) {
+  .dropdownWrapper {
+    display: flex;
+    align-items: center;
+  }
+}
diff --git a/website/src/css/custom.css b/website/src/css/custom.css
index ce0b531af..392c310e1 100644
--- a/website/src/css/custom.css
+++ b/website/src/css/custom.css
@@ -256,4 +256,19 @@ div:has(> .vhsImage) {
 	.providerDocColumn {
 	  width: 100%;
 	}
-  }
\ No newline at end of file
+  }
+
+/*
+* breadcrumbs with actions (stackql-deploy dropdown)
+*/
+.breadcrumbs-with-actions {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-wrap: nowrap;
+}
+
+.breadcrumbs-with-actions nav {
+  flex: 1;
+  min-width: 0;
+}
\ No newline at end of file
diff --git a/website/src/theme/DocBreadcrumbs/index.js b/website/src/theme/DocBreadcrumbs/index.js
new file mode 100644
index 000000000..7f0bb4b5a
--- /dev/null
+++ b/website/src/theme/DocBreadcrumbs/index.js
@@ -0,0 +1,12 @@
+import React from 'react';
+import DocBreadcrumbs from '@theme-original/DocBreadcrumbs';
+import StackqlDeployDropdown from '@site/src/components/StackqlDeployDropdown/StackqlDeployDropdown';
+
+export default function DocBreadcrumbsWrapper(props) {
+  return (
+    <div className="breadcrumbs-with-actions">
+      <DocBreadcrumbs {...props} />
+      <StackqlDeployDropdown />
+    </div>
+  );
+}