diff --git a/system/packs/core-macros.db b/system/packs/core-macros.db
index 48150a1..99a692c 100644
--- a/system/packs/core-macros.db
+++ b/system/packs/core-macros.db
@@ -4,5 +4,5 @@
 {"_id":"dz61B4h3iJwOC0Ob","name":"Draw 5 Ujik names","type":"script","author":"Rv52pj6itbOX14wX","img":"systems/l5r5e/assets/icons/actors/character.svg","scope":"global","command":"game.l5r5e.HelpersL5r5e.drawManyFromPack(\"l5r5e.core-name-tables\", \"Ujik names\", 5);","folder":null,"sort":0,"permission":{"default":0},"flags":{}}
 {"_id":"ed0HRLOWSKm6YTUS","name":"Draw 5 Japanese names (male)","type":"script","author":"Rv52pj6itbOX14wX","img":"systems/l5r5e/assets/icons/actors/traditional-japanese-man.svg","scope":"global","command":"game.l5r5e.HelpersL5r5e.drawManyFromPack(\"l5r5e.core-name-tables\", \"Japanese names (Male)\", 5);","folder":null,"sort":0,"permission":{"default":0},"flags":{}}
 {"_id":"fk2naBrDnz8ZAVHR","name":"Draw 5 Japanese names (female)","type":"script","author":"Rv52pj6itbOX14wX","img":"systems/l5r5e/assets/icons/actors/traditional-japanese-woman.svg","scope":"global","command":"game.l5r5e.HelpersL5r5e.drawManyFromPack(\"l5r5e.core-name-tables\", \"Japanese names (Female)\", 5);","folder":null,"sort":0,"permission":{"default":0},"flags":{}}
-{"_id":"ggs1eiqkfVWlm5JM","name":"Draw Names Dialog","type":"script","author":"Rv52pj6itbOX14wX","img":"systems/l5r5e/assets/icons/actors/army.svg","scope":"global","command":"const pack = \"l5r5e.core-name-tables\";\nconst comp = await game.packs.get(pack);\nif (!comp) { console.log(`L5R5E | Pack not found[${pack}]`); return; }\nif (!comp.indexed) { await comp.getDocuments(); }\n\nlet radioTablesHtml = \"\";\ncomp.index.forEach(obj => { radioTablesHtml += `<label><input type=\"radio\" id=\"${obj._id}\" name=\"tableName\" value=\"${obj.name}\" ${radioTablesHtml === \"\" ? 'checked' : ''}> ${obj.name}</label>`; });\n\nnew Dialog({\n  title: \"L5R5E Draw Names\",\n  content: `\n    <form class=\"noflex\" autocomplete=\"off\">\n      <div class=\"form-group\">\n        <label>${game.i18n.localize('ENTITY.RollTable')}:</label>\n        <div class=\"form-fields\" style=\"flex-direction: column;align-items: flex-start\">\n          ${radioTablesHtml}\n        </div>\n      </div>\n      <hr>\n      <div class=\"form-group\">\n        <label><i class=\"d6\"></i> ${game.i18n.localize('l5r5e.quantity')}:</label>\n        <div class=\"form-fields\">\n          <input type=\"number\" name=\"drawNumber\" value=\"5\" min=\"0\" max=\"99\"/>\n        </div>\n      </div>\n    </form>\n    `,\n  buttons: {\n    no: {\n      icon: \"<i class='fas fa-times'></i>\",\n      label: game.i18n.localize('Cancel')\n    },\n    yes: {\n      icon: \"<i class='fas fa-check'></i>\",\n      label: game.i18n.localize('TABLE.Roll'),\n      callback: (html) => {\n        const tableName  = html.find('input[name=\"tableName\"]:checked')[0]?.value || null;\n        const drawNumber = html.find('input[name=\"drawNumber\"]')[0]?.value || null;\n        if (!tableName || !drawNumber || drawNumber < 1) {return;}\n        game.l5r5e.HelpersL5r5e.drawManyFromPack(pack, tableName, drawNumber);\n      }\n    },\n  },\n  default: \"no\"\n}).render(true);","folder":null,"sort":0,"permission":{"default":0},"flags":{}}
+{"_id":"ggs1eiqkfVWlm5JM","name":"Draw Names Dialog","type":"script","author":"Rv52pj6itbOX14wX","img":"systems/l5r5e/assets/icons/actors/army.svg","scope":"global","command":"const pack = \"l5r5e.core-name-tables\";\nconst comp = await game.packs.get(pack);\nif (!comp) { console.log(`L5R5E | Pack not found[${pack}]`); return; }\nif (!comp.indexed || comp.size < 1) { await comp.getDocuments(); }\n\nlet radioTablesHtml = \"\";\ncomp.index.forEach(obj => { radioTablesHtml += `<label><input type=\"radio\" id=\"${obj._id}\" name=\"tableName\" value=\"${obj.name}\" ${radioTablesHtml === \"\" ? 'checked' : ''}> ${obj.name}</label>`; });\n\nnew Dialog({\n  title: \"L5R5E Draw Names\",\n  content: `\n    <form class=\"noflex\" autocomplete=\"off\">\n      <div class=\"form-group\">\n        <label>${game.i18n.localize('ENTITY.RollTable')}:</label>\n        <div class=\"form-fields\" style=\"flex-direction: column;align-items: flex-start\">\n          ${radioTablesHtml}\n        </div>\n      </div>\n      <hr>\n      <div class=\"form-group\">\n        <label><i class=\"d6\"></i> ${game.i18n.localize('l5r5e.quantity')}:</label>\n        <div class=\"form-fields\">\n          <input type=\"number\" name=\"drawNumber\" value=\"5\" min=\"0\" max=\"99\"/>\n        </div>\n      </div>\n    </form>\n    `,\n  buttons: {\n    no: {\n      icon: \"<i class='fas fa-times'></i>\",\n      label: game.i18n.localize('Cancel')\n    },\n    yes: {\n      icon: \"<i class='fas fa-check'></i>\",\n      label: game.i18n.localize('TABLE.Roll'),\n      callback: (html) => {\n        const tableName  = html.find('input[name=\"tableName\"]:checked')[0]?.value || null;\n        const drawNumber = html.find('input[name=\"drawNumber\"]')[0]?.value || null;\n        if (!tableName || !drawNumber || drawNumber < 1) {return;}\n        game.l5r5e.HelpersL5r5e.drawManyFromPack(pack, tableName, drawNumber);\n      }\n    },\n  },\n  default: \"no\"\n}).render(true);","folder":null,"sort":0,"permission":{"default":0},"flags":{}}
 {"_id":"hpfDGUS48dA2pkUB","name":"Open Character Sheet (linked actor)","type":"script","author":"Rv52pj6itbOX14wX","img":"systems/l5r5e/assets/icons/actors/character.svg","scope":"global","command":"game.user.character?.sheet.render(true);","folder":null,"sort":0,"permission":{"default":0},"flags":{}}
diff --git a/system/scripts/helpers.js b/system/scripts/helpers.js
index afc307d..9a5e976 100644
--- a/system/scripts/helpers.js
+++ b/system/scripts/helpers.js
@@ -681,7 +681,7 @@ export class HelpersL5r5e {
             console.log(`L5R5E | Pack not found[${pack}]`);
             return;
         }
-        if (!comp.indexed) {
+        if (!comp.indexed || comp.size < 1) {
             await comp.getDocuments();
         }
         const table = await comp.getName(tableName);