diff --git a/library/index.d.ts b/library/index.d.ts
index dc2b8cf..e72ab4f 100644
--- a/library/index.d.ts
+++ b/library/index.d.ts
@@ -1,8 +1,8 @@
 export as namespace hitomi;
 
 interface PageRange {
-    startPage: number;
-    endPage?: number;
+	startIndex: number;
+	endIndex?: number;
 }
 
 export interface Image {
diff --git a/library/index.js b/library/index.js
index 414a078..31882ce 100644
--- a/library/index.js
+++ b/library/index.js
@@ -1 +1 @@
-"use strict";var __awaiter=this&&this.__awaiter||function(e,t,r,a){return new(r||(r=Promise))(function(n,i){function l(e){try{s(a.next(e))}catch(e){i(e)}}function o(e){try{s(a.throw(e))}catch(e){i(e)}}function s(e){var t;e.done?n(e.value):(t=e.value,t instanceof r?t:new r(function(e){e(t)})).then(l,o)}s((a=a.apply(e,t||[])).next())})},__importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.queryTag=exports.parseTag=exports.getGalleryIdList=exports.getGalleryData=exports.getNozomiUrl=exports.getGalleryUrl=exports.getImageUrl=void 0;const https_1=__importDefault(require("https")),tls_1=__importDefault(require("tls")),node_fetch_1=__importDefault(require("node-fetch"));Number.isInteger=function(e){return!(Number.parseInt(e)!==Number(e)||!Number.isFinite(e)||"object"==typeof e)};class Agent extends https_1.default.Agent{createConnection(e,t){return e.servername=void 0,tls_1.default.connect(e,t)}}const requestOption={method:"GET",agent:new Agent({rejectUnauthorized:!1,keepAlive:!0}),headers:{Accept:"*/*","Accept-Encoding":"gzip, deflate, br",Connection:"keep-alive"}};function getImageUrl(e,t,r){const a=void 0!==r&&r.isThumbnail;switch(t){case"jpg":if(a||"jpg"===e.extension)break;throw Error("Invalid extension");case"png":if("png"!==e.extension)throw Error("Invalid extension");if(a)throw Error("Invalid extension for thumbnail");break;case"avif":if(e.hasAvif)break;throw Error("Invalid extension");case"webp":if(e.hasWebp){if(a)throw Error("Invalid extension for thumbnail");break}throw Error("Invalid extension")}if(!/^[0-9a-f]{64}$/.test(e.hash))throw Error("Invalid hash value");if(!Number.isInteger(e.index)||e.index<0)throw Error("Invalid image index");if(a&&0!==e.index)throw Error("Invalid index for thumbnail");const n=`${e.hash.slice(-1)}/${e.hash.slice(-3,-1)}/${e.hash}`;let i,l;if(a)i="tn",l="jpg"===t||"png"===t?"bigtn":"avifbigtn";else{let r=3,a=Number.parseInt(e.hash.slice(-3,-1),16);a<48&&(r=2),a<9&&(a=1),i=`${String.fromCharCode(a%r+97)}`,"jpg"===t||"png"===t?(i+="b",l="images"):(i+="a",l=`${t}`)}return`https://${i}.hitomi.la/${l}/${n}.${t}`}function getGalleryUrl(e){const t=encodeURIComponent(null!==e.titleJapanese?e.titleJapanese:e.title).replace(/\(|\)|'|%(2(0|2|3|5|F)|3(C|E|F)|5(B|D)|7(B|D))/g,"-"),r=null!==e.languageLocalName?`-${encodeURIComponent(e.languageLocalName)}`:"";return`https://hitomi.la/${e.type}/${t}${r}-${e.id}.html`.toLocaleLowerCase()}function getNozomiUrl(e){let t="",r="",a="all";switch(e.type){case"male":case"female":t="tag/",r=`${e.type}:${e.name.replace(/_/g," ")}`;break;case"language":r="index",a=e.name;break;default:t=`${e.type}/`,r=e.name.replace(/_/g," ")}return`https://ltn.hitomi.la/n/${t}${r}-${a}.nozomi`}function getGalleryData(e,t){if(!Number.isInteger(e)||Number.isInteger(e)&&e<1)throw Error("Invalid id value");const r=void 0===t||t.includeFiles;return new Promise(function(t,a){try{node_fetch_1.default(`https://ltn.hitomi.la/galleries/${e}.js`,requestOption).then(function(e){return e.text()}).then(function(e){const a=JSON.parse(e.slice(18));let n={id:a.id,title:a.title,titleJapanese:a.japanese_title,type:a.type,language:a.language,languageLocalName:a.language_localname,artists:[],groups:[],series:[],characters:[],tags:[],files:null,publishedDate:new Date(`${a.date}:00`.replace(" ","T"))};for(let e=0;e<a.tags.length;e++){let t="tag";Boolean(a.tags[e].male)?t="male":Boolean(a.tags[e].female)&&(t="female"),n.tags.push({name:a.tags[e].tag,type:t})}if(r){n.files=[];for(let e=0;e<a.files.length;e++)n.files.push({index:e,hash:a.files[e].hash,extension:a.files[e].name.split(".").pop(),hasAvif:Boolean(a.files[e].hasavif),hasWebp:Boolean(a.files[e].haswebp),width:a.files[e].width,height:a.files[e].height})}node_fetch_1.default(getGalleryUrl(n),requestOption).then(function(e){return e.text()}).then(function(e){var r,a,i,l;const o=e.split('content">')[1];return void 0===o?void t(n):(null===(r=o.match(/(?<=\/artist\/)[a-z0-9%]+(?=-all\.html)/g))||void 0===r||r.map(function(e,t,r){null===n.artists&&(n.artists=[]),n.artists.push(decodeURIComponent(e))}),null===(a=o.match(/(?<=\/group\/)[a-z0-9%]+(?=-all\.html)/g))||void 0===a||a.map(function(e,t,r){null===n.groups&&(n.groups=[]),n.groups.push(decodeURIComponent(e))}),null===(i=o.match(/(?<=\/series\/)[a-z0-9%]+(?=-all\.html)/g))||void 0===i||i.map(function(e,t,r){null===n.series&&(n.series=[]),n.series.push(decodeURIComponent(e))}),null===(l=o.match(/(?<=\/character\/)[a-z0-9%]+(?=-all\.html)/g))||void 0===l||l.map(function(e,t,r){null===n.characters&&(n.characters=[]),n.characters.push(decodeURIComponent(e))}),void t(n))})})}catch(e){return void a(e)}})}function getGalleryIdList(e,t){if(!Number.isInteger(e.startPage)||Number.isInteger(e.startPage)&&e.startPage<0)throw Error("Invalid startPage value");if(void 0!==e.endPage&&(!Number.isInteger(e.endPage)||Number.isInteger(e.endPage)&&e.endPage<=e.startPage))throw Error("Invalid endPage value");return new Promise(function(r,a){try{const n=4*e.startPage,i=void 0!==e.endPage?n+4*e.endPage-1:"",l=void 0!==t&&t.reverse;node_fetch_1.default("https://ltn.hitomi.la/index-all.nozomi",Object.assign(Object.assign({},requestOption),{headers:{Range:`bytes=${n}-${i}`}})).then(function(e){return e.arrayBuffer()}).then(function(e){const t=new DataView(e),a=t.byteLength/4;let n=[];if(l)for(let e=0;e<a;e++)n.push(t.getInt32(4*e,!1));else for(let e=a-1;-1!==e;e--)n.push(t.getInt32(4*e,!1));r(n)})}catch(e){return void a(e)}})}function parseTag(e){const t=e.split(" ");if(t.length<1)throw Error("Lack of tag");let r=[...t].map(function(e,t,r){const a=e.replace(/^-/,"").split(":"),[n,i]=[...a];if(2!==a.length||void 0===n||void 0===i||""===n||""===i||!/^(artist|group|type|language|series|tag|male|female)$/.test(n)||!/^[^-_\.][a-z0-9-_.]+$/.test(i))throw Error("Invalid tag");return`${n}:${i}`});for(let e=0;e<r.length;e++){const t=r[e];if(r.splice(e,1),-1!==r.indexOf(t))throw Error("Duplicated tag")}let a=[];for(let e=0;e<t.length;e++){const[r,n]=t[e].replace(/^-/,"").split(":");a.push({type:r,name:n,isNegative:t[e].startsWith("-")})}return a}function queryTag(e){if(e.length<1)throw Error("Lack of tag");let t=[],r=[];for(let a=0;a<e.length;a++)switch(void 0!==e[a].isNegative&&e[a].isNegative){case!1:t.push(e[a]);break;case!0:r.push(e[a])}return new Promise(function(e,a){return __awaiter(this,void 0,void 0,function*(){try{let n=[];0===t.length&&(n=yield getGalleryIdList({startPage:0}));for(let e=0;e<t.length;e++)yield node_fetch_1.default(getNozomiUrl(t[e]),requestOption).then(function(e){return e.arrayBuffer()}).then(function(t){const r=new DataView(t),a=r.byteLength/4;let i=[];for(let e=0;e<a;e++)i.push(r.getInt32(4*e,!1));let l=new Set(i);n=0!==e?n.filter(function(e,t,r){return l.has(e)?e:void 0}):[...i]});for(let e=0;e<r.length;e++)yield node_fetch_1.default(getNozomiUrl(r[e]),requestOption).then(function(e){return e.arrayBuffer()}).then(function(e){const t=new DataView(e),r=t.byteLength/4;let a=[];for(let e=0;e<r;e++)a.push(t.getInt32(4*e,!1));let i=new Set(a);n=n.filter(function(e,t,r){return i.has(e)?void 0:e})});return void e(n)}catch(e){return void a(e)}})})}exports.getImageUrl=getImageUrl,exports.getGalleryUrl=getGalleryUrl,exports.getNozomiUrl=getNozomiUrl,exports.getGalleryData=getGalleryData,exports.getGalleryIdList=getGalleryIdList,exports.parseTag=parseTag,exports.queryTag=queryTag,exports.default={getImageUrl:getImageUrl,getGalleryUrl:getGalleryUrl,getNozomiUrl:getNozomiUrl,getGalleryData:getGalleryData,getGalleryIdList:getGalleryIdList,parseTag:parseTag,queryTag:queryTag};
\ No newline at end of file
+"use strict";var __awaiter=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(a,i){function l(e){try{s(r.next(e))}catch(e){i(e)}}function o(e){try{s(r.throw(e))}catch(e){i(e)}}function s(e){var t;e.done?a(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(l,o)}s((r=r.apply(e,t||[])).next())})},__importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.queryTag=exports.parseTag=exports.getGalleryIdList=exports.getGalleryData=exports.getNozomiUrl=exports.getGalleryUrl=exports.getImageUrl=void 0;const https_1=__importDefault(require("https")),tls_1=__importDefault(require("tls")),node_fetch_1=__importDefault(require("node-fetch"));Number.isInteger=function(e){return!(Number.parseInt(e)!==Number(e)||!Number.isFinite(e)||"object"==typeof e)};class Agent extends https_1.default.Agent{createConnection(e,t){return e.servername=void 0,tls_1.default.connect(e,t)}}const requestOption={method:"GET",agent:new Agent({rejectUnauthorized:!1,keepAlive:!0}),headers:{Accept:"*/*","Accept-Encoding":"gzip, deflate, br",Connection:"keep-alive"}};function getImageUrl(e,t,n){const r=void 0!==n&&n.isThumbnail;switch(t){case"jpg":if(r||"jpg"===e.extension)break;throw Error("Invalid extension");case"png":if("png"!==e.extension)throw Error("Invalid extension");if(r)throw Error("Invalid extension for thumbnail");break;case"avif":if(e.hasAvif)break;throw Error("Invalid extension");case"webp":if(e.hasWebp){if(r)throw Error("Invalid extension for thumbnail");break}throw Error("Invalid extension")}if(!/^[0-9a-f]{64}$/.test(e.hash))throw Error("Invalid hash value");if(!Number.isInteger(e.index)||e.index<0)throw Error("Invalid image index");if(r&&0!==e.index)throw Error("Invalid index for thumbnail");const a=`${e.hash.slice(-1)}/${e.hash.slice(-3,-1)}/${e.hash}`;let i,l;if(r)i="tn",l="jpg"===t||"png"===t?"bigtn":"avifbigtn";else{let n=3,r=Number.parseInt(e.hash.slice(-3,-1),16);r<48&&(n=2),r<9&&(r=1),i=`${String.fromCharCode(r%n+97)}`,"jpg"===t||"png"===t?(i+="b",l="images"):(i+="a",l=`${t}`)}return`https://${i}.hitomi.la/${l}/${a}.${t}`}function getGalleryUrl(e){const t=encodeURIComponent(null!==e.titleJapanese?e.titleJapanese:e.title).replace(/\(|\)|'|%(2(0|2|3|5|F)|3(C|E|F)|5(B|D)|7(B|D))/g,"-"),n=null!==e.languageLocalName?`-${encodeURIComponent(e.languageLocalName)}`:"";return`https://hitomi.la/${e.type}/${t}${n}-${e.id}.html`.toLocaleLowerCase()}function getNozomiUrl(e){let t="",n="",r="all";switch(e.type){case"male":case"female":t="tag/",n=`${e.type}:${e.name.replace(/_/g," ")}`;break;case"language":n="index",r=e.name;break;default:t=`${e.type}/`,n=e.name.replace(/_/g," ")}return`https://ltn.hitomi.la/n/${t}${n}-${r}.nozomi`}function getGalleryData(e,t){if(!Number.isInteger(e)||Number.isInteger(e)&&e<1)throw Error("Invalid id value");const n=void 0===t||t.includeFiles;return new Promise(function(t,r){try{node_fetch_1.default(`https://ltn.hitomi.la/galleries/${e}.js`,requestOption).then(function(e){return e.text()}).then(function(e){const r=JSON.parse(e.slice(18));let a={id:r.id,title:r.title,titleJapanese:r.japanese_title,type:r.type,language:r.language,languageLocalName:r.language_localname,artists:[],groups:[],series:[],characters:[],tags:[],files:null,publishedDate:new Date(`${r.date}:00`.replace(" ","T"))};if(null!==r.tags)for(let e=0;e<r.tags.length;e++){let t="tag";Boolean(r.tags[e].male)?t="male":Boolean(r.tags[e].female)&&(t="female"),a.tags.push({name:r.tags[e].tag,type:t})}if(n){a.files=[];for(let e=0;e<r.files.length;e++)a.files.push({index:e,hash:r.files[e].hash,extension:r.files[e].name.split(".").pop(),hasAvif:Boolean(r.files[e].hasavif),hasWebp:Boolean(r.files[e].haswebp),width:r.files[e].width,height:r.files[e].height})}node_fetch_1.default(getGalleryUrl(a),requestOption).then(function(e){return e.text()}).then(function(e){var n,r,i,l;const o=e.split('content">')[1];void 0!==o&&(null===(n=o.match(/(?<=\/artist\/)[a-z0-9%]+(?=-all\.html)/g))||void 0===n||n.map(function(e,t,n){a.artists.push(decodeURIComponent(e))}),null===(r=o.match(/(?<=\/group\/)[a-z0-9%]+(?=-all\.html)/g))||void 0===r||r.map(function(e,t,n){a.groups.push(decodeURIComponent(e))}),null===(i=o.match(/(?<=\/series\/)[a-z0-9%]+(?=-all\.html)/g))||void 0===i||i.map(function(e,t,n){a.series.push(decodeURIComponent(e))}),null===(l=o.match(/(?<=\/character\/)[a-z0-9%]+(?=-all\.html)/g))||void 0===l||l.map(function(e,t,n){a.characters.push(decodeURIComponent(e))})),t(a)})})}catch(e){return void r(e)}})}function getGalleryIdList(e,t){if(!Number.isInteger(e.startIndex)||Number.isInteger(e.startIndex)&&e.startIndex<0)throw Error("Invalid startIndex value");if(void 0!==e.endIndex&&(!Number.isInteger(e.endIndex)||Number.isInteger(e.endIndex)&&e.endIndex<=e.startIndex))throw Error("Invalid endIndex value");return new Promise(function(n,r){try{const a=4*e.startIndex,i=void 0!==e.endIndex?a+4*(e.endIndex+1)-1:"",l=void 0!==t&&t.reverse;node_fetch_1.default("https://ltn.hitomi.la/index-all.nozomi",Object.assign(Object.assign({},requestOption),{headers:{Range:`bytes=${a}-${i}`}})).then(function(e){return e.arrayBuffer()}).then(function(e){const t=new DataView(e),r=t.byteLength/4;let a=[];if(l)for(let e=0;e<r;e++)a.push(t.getInt32(4*e,!1));else for(let e=r-1;-1!==e;e--)a.push(t.getInt32(4*e,!1));n(a)})}catch(e){return void r(e)}})}function parseTag(e){const t=e.split(" ");if(t.length<1)throw Error("Lack of tag");let n=[...t].map(function(e,t,n){const r=e.replace(/^-/,"").split(":"),[a,i]=[...r];if(2!==r.length||void 0===a||void 0===i||""===a||""===i||!/^(artist|group|type|language|series|tag|male|female)$/.test(a)||!/^[^-_\.][a-z0-9-_.]+$/.test(i))throw Error("Invalid tag");return`${a}:${i}`});for(let e=0;e<n.length;e++){const t=n[e];if(n.splice(e,1),-1!==n.indexOf(t))throw Error("Duplicated tag")}let r=[];for(let e=0;e<t.length;e++){const[n,a]=t[e].replace(/^-/,"").split(":");r.push({type:n,name:a,isNegative:t[e].startsWith("-")})}return r}function queryTag(e){if(e.length<1)throw Error("Lack of tag");let t=[],n=[];for(let r=0;r<e.length;r++)switch(void 0!==e[r].isNegative&&e[r].isNegative){case!1:t.push(e[r]);break;case!0:n.push(e[r])}return new Promise(function(e,r){return __awaiter(this,void 0,void 0,function*(){try{let a=[];0===t.length&&(a=yield getGalleryIdList({startIndex:0}));for(let e=0;e<t.length;e++)yield node_fetch_1.default(getNozomiUrl(t[e]),requestOption).then(function(e){return e.arrayBuffer()}).then(function(t){const n=new DataView(t),r=n.byteLength/4;let i=[];for(let e=0;e<r;e++)i.push(n.getInt32(4*e,!1));let l=new Set(i);a=0!==e?a.filter(function(e,t,n){return l.has(e)?e:void 0}):[...i]});for(let e=0;e<n.length;e++)yield node_fetch_1.default(getNozomiUrl(n[e]),requestOption).then(function(e){return e.arrayBuffer()}).then(function(e){const t=new DataView(e),n=t.byteLength/4;let r=[];for(let e=0;e<n;e++)r.push(t.getInt32(4*e,!1));let i=new Set(r);a=a.filter(function(e,t,n){return i.has(e)?void 0:e})});return void e(a)}catch(e){return void r(e)}})})}exports.getImageUrl=getImageUrl,exports.getGalleryUrl=getGalleryUrl,exports.getNozomiUrl=getNozomiUrl,exports.getGalleryData=getGalleryData,exports.getGalleryIdList=getGalleryIdList,exports.parseTag=parseTag,exports.queryTag=queryTag,exports.default={getImageUrl:getImageUrl,getGalleryUrl:getGalleryUrl,getNozomiUrl:getNozomiUrl,getGalleryData:getGalleryData,getGalleryIdList:getGalleryIdList,parseTag:parseTag,queryTag:queryTag};
\ No newline at end of file
diff --git a/source/index.ts b/source/index.ts
index cb274fc..03137d1 100644
--- a/source/index.ts
+++ b/source/index.ts
@@ -7,11 +7,11 @@ interface LooseObject {
 }
 
 interface PageRange {
-	startPage: number;
-	endPage?: number;
+	startIndex: number;
+	endIndex?: number;
 }
 
-interface Image {
+export interface Image {
 	index: number;
 	hash: string;
 	extension: 'jpg' | 'png';
@@ -21,13 +21,13 @@ interface Image {
 	height: number;
 }
 
-interface Tag {
+export interface Tag {
 	type: 'artist' | 'group' | 'type' | 'language' | 'series' | 'character' | 'male' | 'female' | 'tag';
 	name: string;
 	isNegative?: boolean;
 }
 
-interface Gallery {
+export interface Gallery {
 	id: number;
 	title: string;
 	titleJapanese: string | null;
@@ -214,19 +214,21 @@ export function getGalleryData(id: number, option?: { includeFiles: boolean; }):
 					publishedDate: new Date(`${responseJson['date']}:00`.replace(' ', 'T'))
 				}
 
-				for(let i = 0; i < responseJson['tags'].length; i++) {
-					let type: Tag['type'] = 'tag';
-
-					if(Boolean(responseJson['tags'][i]['male'])) {
-						type = 'male';
-					} else if(Boolean(responseJson['tags'][i]['female'])) {
-						type = 'female';
+				if(responseJson['tags'] !== null) {
+					for(let i = 0; i < responseJson['tags'].length; i++) {
+						let type: Tag['type'] = 'tag';
+	
+						if(Boolean(responseJson['tags'][i]['male'])) {
+							type = 'male';
+						} else if(Boolean(responseJson['tags'][i]['female'])) {
+							type = 'female';
+						}
+	
+						galleryData['tags'].push({
+							name: responseJson['tags'][i]['tag'],
+							type: type
+						});
 					}
-
-					galleryData['tags'].push({
-						name: responseJson['tags'][i]['tag'],
-						type: type
-					});
 				}
 
 				if(includeFiles) {
@@ -247,74 +249,55 @@ export function getGalleryData(id: number, option?: { includeFiles: boolean; }):
 
 				fetch(getGalleryUrl(galleryData), requestOption)
 				.then(function (_response: Response): string | PromiseLike<string> {
-					return _response.text()
+					return _response.text();
 				})
 				.then(function (_responseText: string): void | PromiseLike<void> {
 					const galleryContentHtml: string = _responseText.split('content">')[1];
 
-					if(typeof(galleryContentHtml) === 'undefined') {
-						resolve(galleryData);
-						return;
-					} else {
+					if(typeof(galleryContentHtml) !== 'undefined') {
 						galleryContentHtml.match(/(?<=\/artist\/)[a-z0-9%]+(?=-all\.html)/g)
 						?.map(function (value: string, index: number, array: string[]): void {
-							if(galleryData['artists'] === null) {
-								galleryData['artists'] = [];
-							}
-
 							galleryData['artists'].push(decodeURIComponent(value));
 						});
 
 						galleryContentHtml.match(/(?<=\/group\/)[a-z0-9%]+(?=-all\.html)/g)
 						?.map(function (value: string, index: number, array: string[]): void {
-							if(galleryData['groups'] === null) {
-								galleryData['groups'] = [];
-							}
-							
 							galleryData['groups'].push(decodeURIComponent(value));
 						});
 
 						galleryContentHtml.match(/(?<=\/series\/)[a-z0-9%]+(?=-all\.html)/g)
 						?.map(function (value: string, index: number, array: string[]): void {
-							if(galleryData['series'] === null) {
-								galleryData['series'] = [];
-							}
-							
 							galleryData['series'].push(decodeURIComponent(value));
 						});
 
 						galleryContentHtml.match(/(?<=\/character\/)[a-z0-9%]+(?=-all\.html)/g)
 						?.map(function (value: string, index: number, array: string[]): void {
-							if(galleryData['characters'] === null) {
-								galleryData['characters'] = [];
-							}
-							
 							galleryData['characters'].push(decodeURIComponent(value));
 						});
-
-						resolve(galleryData);
-						return;
 					}
+
+					resolve(galleryData);
+					return;
 				});
 			});
 		} catch(error: any) {
 			reject(error);
 			return;
 		}
-	})
+	});
 }
 
 export function getGalleryIdList(range: PageRange, option?: { reverse: boolean; }): Promise<number[]> {
-	if(!Number.isInteger(range['startPage']) || (Number.isInteger(range['startPage']) && range['startPage'] < 0)) {
-		throw Error('Invalid startPage value');
-	} else if(typeof(range['endPage']) !== 'undefined' && (!Number.isInteger(range['endPage']) || (Number.isInteger(range['endPage']) && range['endPage'] <= range['startPage']))) {
-		throw Error('Invalid endPage value');
+	if(!Number.isInteger(range['startIndex']) || (Number.isInteger(range['startIndex']) && range['startIndex'] < 0)) {
+		throw Error('Invalid startIndex value');
+	} else if(typeof(range['endIndex']) !== 'undefined' && (!Number.isInteger(range['endIndex']) || (Number.isInteger(range['endIndex']) && range['endIndex'] <= range['startIndex']))) {
+		throw Error('Invalid endIndex value');
 	}
 
 	return new Promise<number[]>(function (resolve: (value: number[] | PromiseLike<number[]>) => void, reject: (reason: any) => void) {
 		try {
-			const startByte: number = range['startPage'] * 4;
-			const endByte: number | string = typeof(range['endPage']) !== 'undefined' ? startByte + range['endPage'] * 4 - 1 : '';
+			const startByte: number = range['startIndex'] * 4;
+			const endByte: number | string = typeof(range['endIndex']) !== 'undefined' ? startByte + (range['endIndex'] + 1) * 4 - 1 : '';
 			const reverse: boolean = typeof(option) !== 'undefined' ? option['reverse'] : false;
 
 			fetch('https://ltn.hitomi.la/index-all.nozomi', {
@@ -389,7 +372,7 @@ export function parseTag(tagString: string): Tag[] {
 			type: type,
 			name: name,
 			isNegative: tagStringList[i].startsWith('-')
-		})
+		});
 	}
 
 	return tagList;
@@ -421,7 +404,7 @@ export function queryTag(tagList: Tag[]): Promise<number[]> {
 			let idList: number[] = [];
 
 			if(positiveTagList.length === 0) {
-				idList = await getGalleryIdList({ startPage: 0 });
+				idList = await getGalleryIdList({ startIndex: 0 });
 			}
 
 			for(let i = 0; i < positiveTagList.length; i++) {