diff --git a/editor/extensions/imagelib/openclipart.js b/editor/extensions/imagelib/openclipart.js
index 1cc77ccc..28eb4433 100644
--- a/editor/extensions/imagelib/openclipart.js
+++ b/editor/extensions/imagelib/openclipart.js
@@ -1,9 +1,215 @@
-import {jml, body} from '../../external/jamilih/jml-es.js';
+import {jml, body, nbsp} from '../../external/jamilih/jml-es.js';
 
 import $ from '../../../node_modules/query-result/esm/index.js';
 import {manipulation} from '../../../node_modules/qr-manipulation/dist/index-es.js';
 manipulation($, jml);
 
+const baseAPIURL = 'https://openclipart.org/search/json/';
+
+async function processResults (url) {
+  function queryLink (query) {
+    return ['a', {
+      href: 'javascript: void(0);',
+      dataset: {value: query},
+      $on: {click (e) {
+        e.preventDefault();
+        const {value} = this.dataset;
+        $('#query')[0].$set(value);
+        $('#openclipart')[0].$submit();
+      }}
+    }, [query]];
+  }
+
+  const r = await fetch(url);
+  const json = await r.json();
+  console.log('json', json);
+
+  if (!json || json.msg !== 'success') {
+    alert('There was a problem downloading the results');
+    return;
+  }
+  const {payload, info: {
+    results: numResults,
+    pages,
+    current_page: currentPage
+  }} = json;
+
+  // $('#page')[0].value = currentPage;
+  // $('#page')[0].max = pages;
+
+  // Unused properties:
+  // - `svg_filesize` always 0?
+  // - `dimensions: {
+  //      png_thumb: {width, height},
+  //      png_full_lossy: {width, height}
+  //    }` object of relevance?
+  // - No need for `tags` with `tags_array`
+  // - `svg`'s: `png_thumb`, `png_full_lossy`, `png_2400px`
+  const semiColonSep = '; ' + nbsp;
+  $('#results').jml('div', [
+    ['span', [
+      'Number of results: ',
+      numResults
+    ]],
+    semiColonSep,
+    ['span', [
+      'page ',
+      currentPage,
+      ' out of ',
+      pages
+    ]],
+    ...payload.map(({
+      title, description, id,
+      uploader, created,
+      svg: {url: svgURL},
+      detail_link: detailLink,
+      tags_array: tagsArray,
+      downloaded_by: downloadedBy,
+      total_favorites: totalFavorites
+    }) => {
+      const imgHW = '100px';
+      const colonSep = ': ' + nbsp;
+      return ['div', [
+        ['button', {style: 'margin-right: 8px; border: 2px solid black;', dataset: {id, value: svgURL}, $on: {
+          async click (e) {
+            e.preventDefault();
+            const {value: svgURL, id} = this.dataset;
+            console.log('this', id, svgURL);
+            /*
+            const result = await fetch(svgURL);
+            const svg = await result.text();
+            console.log('svg', svg);
+            */
+            // Todo: Pass to our API
+          }
+        }}, [
+          ['img', {src: svgURL, style: `width: ${imgHW}; height: ${imgHW};`}]
+        ]],
+        ['b', [title]],
+        ' ',
+        ['i', [description]],
+        ' ',
+        ['span', [
+          '(ID: ',
+          ['a', {
+            href: 'javascript: void(0);',
+            dataset: {value: id},
+            $on: {
+              click (e) {
+                e.preventDefault();
+                const {value} = this.dataset;
+                $('#byids')[0].$set(value);
+                $('#openclipart')[0].$submit();
+              }
+            }
+          }, [id]],
+          ')'
+        ]],
+        ' ',
+        ['i', [
+          ['a', {
+            href: detailLink,
+            target: '_blank'
+          }, ['Details']]
+        ]],
+        ['br'],
+        ['span', [
+          ['u', ['Uploaded by']], colonSep,
+          queryLink(uploader),
+          semiColonSep
+        ]],
+        ['span', [
+          ['u', ['Download count']], colonSep,
+          downloadedBy,
+          semiColonSep
+        ]],
+        ['span', [
+          ['u', ['Times used as favorite']], colonSep,
+          totalFavorites,
+          semiColonSep
+        ]],
+        ['span', [
+          ['u', ['Created date']], colonSep,
+          created
+        ]],
+        ['br'],
+        ['u', ['Tags']], colonSep,
+        ...tagsArray.map((tag) => {
+          return ['span', [
+            ' ',
+            queryLink(tag)
+          ]];
+        })
+      ]];
+    }),
+    ['br'], ['br'],
+    (currentPage === 1 || pages <= 2
+      ? ''
+      : ['span', [
+        ['a', {
+          href: 'javascript: void(0);',
+          $on: {
+            click (e) {
+              e.preventDefault();
+              $('#page')[0].value = 1;
+              $('#openclipart')[0].$submit();
+            }
+          }
+        }, ['First']],
+        ' '
+      ]]
+    ),
+    (currentPage === 1
+      ? ''
+      : ['span', [
+        ['a', {
+          href: 'javascript: void(0);',
+          $on: {
+            click (e) {
+              e.preventDefault();
+              $('#page')[0].value = currentPage - 1;
+              $('#openclipart')[0].$submit();
+            }
+          }
+        }, ['Prev']],
+        ' '
+      ]]
+    ),
+    (currentPage === pages
+      ? ''
+      : ['span', [
+        ['a', {
+          href: 'javascript: void(0);',
+          $on: {
+            click (e) {
+              e.preventDefault();
+              $('#page')[0].value = currentPage + 1;
+              $('#openclipart')[0].$submit();
+            }
+          }
+        }, ['Next']],
+        ' '
+      ]]
+    ),
+    (currentPage === pages || pages <= 2
+      ? ''
+      : ['span', [
+        ['a', {
+          href: 'javascript: void(0);',
+          $on: {
+            click (e) {
+              e.preventDefault();
+              $('#page')[0].value = pages;
+              $('#openclipart')[0].$submit();
+            }
+          }
+        }, ['Last']],
+        ' '
+      ]]
+    )
+  ]);
+}
+
 jml('div', [
   ['style', [
     `.control {
@@ -11,184 +217,97 @@ jml('div', [
     }`
   ]],
   ['form', {
-    $on: {
-      async submit (e) {
-        e.preventDefault();
-        await this.$submit();
-      }
-    },
+    id: 'openclipart',
     $custom: {
       async $submit () {
-        console.log('submit2');
-        const url = new URL('https://openclipart.org/search/json/');
+        const url = new URL(baseAPIURL);
         [
-          'query', 'sort', 'amount', 'page'
+          'query', 'sort', 'amount', 'page', 'byids'
         ].forEach((prop) => {
           const {value} = $('#' + prop)[0];
-          url.searchParams.set(prop, value);
+          if (value) {
+            url.searchParams.set(prop, value);
+          }
         });
-        const r = await fetch(url);
-        const json = await r.json();
-
-        if (!json || json.msg !== 'success') {
-          alert('There was a problem downloading the results');
-          return;
-        }
-        console.log('json', json);
-        const {payload, info: {
-          results: numResults,
-          pages,
-          current_page: currentPage
-        }} = json;
-
-        // $('#page')[0].value = currentPage;
-        // $('#page')[0].max = pages;
-
-        function queryLink (uploader) {
-          return ['a', {
-            href: '#',
-            dataset: {value: uploader},
-            $on: {click (e) {
-              e.preventDefault();
-              const {value} = this.dataset;
-              console.log('v0', value);
-            }}
-          }, [uploader]];
-        }
-
-        // Unused properties:
-        // - `svg_filesize` always 0?
-        // - `dimensions: {
-        //      png_thumb: {width, height},
-        //      png_full_lossy: {width, height}
-        //    }` object of relevance?
-        // - No need for `tags` with `tags_array`
-        // - `svg`'s: `png_thumb`, `png_full_lossy`, `png_2400px`
-        $('#results').htmlJML([
-          ['span', [
-            'Number of results: ',
-            numResults
-          ]],
-          ['span', [
-            'Page ',
-            currentPage,
-            'out of: ',
-            pages
-          ]],
-          ...payload.map(({
-            title, description, id,
-            uploader, created,
-            svg: {url: svgURL},
-            detail_link: detailLink,
-            tags_array: tagsArray,
-            downloaded_by: downloadedBy,
-            total_favorites: totalFavorites
-          }) => {
-            return ['div', [
-              ['b', [title]],
-              ['br'],
-              ['i', [description]],
-              ['span', [
-                ['a', {
-                  href: detailLink,
-                  target: '_blank'
-                }, ['Details']]
-              ]],
-              ['button', {
-                $on: {
-                  async click () {
-                    const svgURL = this.dataset.value;
-                    console.log('this', svgURL);
-                    /*
-                    const result = await fetch(svgURL);
-                    const svg = await result.text();
-                    console.log('svg', svg);
-                    */
-                    // Todo: Pass to our API
-                  }
-                },
-                dataset: {value: svgURL}
-              }, [
-                'Use SVG'
-              ]],
-              ['span', [
-                '(ID: ',
-                ['a', {
-                  href: '#',
-                  dataset: {value: id},
-                  $on: {click (e) {
-                    e.preventDefault();
-                    const {value} = this.dataset;
-                    // Todo: byids for searching by id/comma-separated ids
-                    console.log('v', value);
-                  }}
-                }, [id]],
-                ')'
-              ]],
-              ['span', [
-                'Uploaded by: ',
-                queryLink(uploader)
-              ]],
-              ...tagsArray.map((tag) => {
-                return ['span', [
-                  ' ',
-                  queryLink(tag)
-                ]];
-              }),
-              ['span', [
-                'Created date: ',
-                created
-              ]],
-              ['span', [
-                'Download count: ',
-                downloadedBy
-              ]],
-              ['span', [
-                'Times used as favorite: ',
-                totalFavorites
-              ]]
-            ]];
-          })
-        ]);
+        await processResults(url);
+      }
+    },
+    $on: {
+      submit (e) {
+        e.preventDefault();
+        this.$submit();
       }
     }
   }, [
     // Todo: i18nize
-    ['div', {class: 'control'}, [
-      ['label', [
-        'Query (Title, description, uploader, or tag): ',
-        ['input', {id: 'query', name: 'query'}]
+    ['fieldset', [
+      ['legend', ['Search terms']],
+      ['div', {class: 'control'}, [
+        ['label', [
+          'Query (Title, description, uploader, or tag): ',
+          ['input', {id: 'query', name: 'query', placeholder: 'cat', $custom: {
+            $set (value) {
+              $('#byids')[0].value = '';
+              this.value = value;
+            }
+          }, $on: {
+            change () {
+              $('#byids')[0].value = '';
+            }
+          }}]
+        ]]
+      ]],
+      ['br'],
+      ' OR ',
+      ['br'],
+      ['div', {class: 'control'}, [
+        ['label', [
+          'IDs (single or comma-separated): ',
+          ['input', {id: 'byids', name: 'ids', placeholder: '271380, 265741', $custom: {
+            $set (value) {
+              $('#query')[0].value = '';
+              this.value = value;
+            }
+          }, $on: {
+            change () {
+              $('#query')[0].value = '';
+            }
+          }}]
+        ]]
       ]]
     ]],
-    ['div', {class: 'control'}, [
-      ['label', [
-        'Sort by: ',
-        ['select', {id: 'sort'}, [
-          // Todo: i18nize first values
-          ['Date', 'date'],
-          ['Downloads', 'downloads'],
-          ['Favorited', 'favorites']
-        ].map(([text, value = text]) => {
-          return ['option', {value}, [text]];
-        })]
-      ]]
-    ]],
-    ['div', {class: 'control'}, [
-      ['label', [
-        'Results per page: ',
-        ['input', {
-          id: 'amount', name: 'amount', value: 10,
-          type: 'number', min: 1, max: 200, step: 1, pattern: '\\d+'}]
-      ]]
-    ]],
-    ['div', {class: 'control'}, [
-      ['label', [
-        'Page number: ',
-        ['input', {
-          // max: 1, // We'll change this based on available results
-          id: 'page', name: 'page', value: 1, style: 'width: 40px;',
-          type: 'number', min: 1, step: 1, pattern: '\\d+'
-        }]
+    ['fieldset', [
+      ['legend', ['Configuring results']],
+      ['div', {class: 'control'}, [
+        ['label', [
+          'Sort by: ',
+          ['select', {id: 'sort'}, [
+            // Todo: i18nize first values
+            ['Date', 'date'],
+            ['Downloads', 'downloads'],
+            ['Favorited', 'favorites']
+          ].map(([text, value = text]) => {
+            return ['option', {value}, [text]];
+          })]
+        ]]
+      ]],
+      ['div', {class: 'control'}, [
+        ['label', [
+          'Results per page: ',
+          ['input', {
+            id: 'amount', name: 'amount', value: 10,
+            type: 'number', min: 1, max: 200, step: 1, pattern: '\\d+'}]
+        ]]
+      ]],
+      ['div', {class: 'control'}, [
+        ['label', [
+          'Page number: ',
+          ['input', {
+            // max: 1, // We'll change this based on available results
+            id: 'page', name: 'page', value: 1, style: 'width: 40px;',
+            type: 'number', min: 1, step: 1, pattern: '\\d+'
+          }]
+        ]]
       ]]
     ]],
     ['div', {class: 'control'}, [
diff --git a/package-lock.json b/package-lock.json
index 0be6acb7..e53ba8cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5587,9 +5587,9 @@
       "dev": true
     },
     "qr-manipulation": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/qr-manipulation/-/qr-manipulation-0.6.1.tgz",
-      "integrity": "sha512-H6xACEWInMrv7AiKSH5xqCEO7opn9WGBe14jAreHu3vqjJpgEcBOYfsR2H45sFlXuWcPMz1gphaHhax/6yMAVQ==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/qr-manipulation/-/qr-manipulation-0.7.0.tgz",
+      "integrity": "sha512-eSRJ38xLbdcHAEWLKX91OaUVzUuqPGCdnyPu2AjNMRr6OEpxVrvVpCEmaOQN2QZ0zhgA77NxMWLS51W2P+7DxQ==",
       "dev": true
     },
     "qs": {
diff --git a/package.json b/package.json
index a8985d05..bd163734 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "node-static": "^0.7.11",
     "opn-cli": "^3.1.0",
     "promise-fs": "^1.3.0",
-    "qr-manipulation": "^0.6.1",
+    "qr-manipulation": "^0.7.0",
     "query-result": "^0.2.0",
     "qunit": "^2.6.2",
     "rollup": "0.66.2",