diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index a9856d76b..c1ea33dc1 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -33,7 +33,7 @@ class ImageService extends Service {
       .filter((source) => {
         if (query.labels.length && !query.labels.includes(source.config.label)) return false
         if (this.config.detectLanguage) {
-          const probabilities = this.languageDetect.detect(query.raw, 3).filter((x) => x[1] > this.config.confidence)
+          const probabilities = this.languageDetect.detect(query.query, 3).filter((x) => x[1] > this.config.confidence)
           if (!probabilities.length) {
             // if no language detected, just treat it as any language
             return true
@@ -49,7 +49,8 @@ class ImageService extends Service {
 
     // return the first non-empty result
     for (const source of sources) {
-      const images = await source.get(query)
+      const tags = source.tokenize(query.query)
+      const images = await source.get({ ...query, tags, raw: query.query })
       if (images?.length) return images
     }
 
@@ -58,8 +59,10 @@ class ImageService extends Service {
 }
 
 namespace ImageService {
-  export interface Query extends ImageSource.Query {
+  export interface Query {
+    query: string
     labels: string[]
+    count: number
   }
 }
 
@@ -117,15 +120,14 @@ export function apply(ctx: Context, config: Config) {
   }
 
   ctx
-    .command('booru <query...>')
+    .command('booru <query:text>')
     .option('count', '-c <count:number>', { type: count, fallback: 1 })
     .option('label', '-l <label:string>')
     .action(async ({ session, options }, query) => {
       query = query?.trim() ?? ''
 
       const images = await ctx.booru.get({
-        tags: query.split(/\s+/),
-        raw: query,
+        query,
         count: options.count,
         labels: options.label?.split(',')?.map((x) => x.trim())?.filter(Boolean) ?? [],
       })
diff --git a/packages/core/src/source.ts b/packages/core/src/source.ts
index 636997833..12592f9aa 100644
--- a/packages/core/src/source.ts
+++ b/packages/core/src/source.ts
@@ -9,6 +9,15 @@ export abstract class ImageSource<Config extends ImageSource.Config = ImageSourc
     this.ctx.booru.register(this)
   }
 
+  /**
+   * split query into tags, default implementation is comma-separated.
+   * 
+   * e.g. `tag1, wordy tag2, UPPER CASED tag3` => `['tag1', 'wordy_tag2', 'upper_cased_tag3']`
+   */
+  tokenize(query: string): string[] {
+    return query.split(',').map((x) => x.trim()).filter(Boolean).map((x) => x.toLowerCase().replace(/ +/g, '_'))
+  }
+
   abstract get(query: ImageSource.Query): Promise<ImageSource.Result[]>
 }
 
diff --git a/packages/lolicon/src/index.ts b/packages/lolicon/src/index.ts
index 867292397..bf4963f5a 100644
--- a/packages/lolicon/src/index.ts
+++ b/packages/lolicon/src/index.ts
@@ -9,6 +9,10 @@ class LoliconImageSource extends ImageSource<LoliconImageSource.Config> {
     super(ctx, config)
   }
 
+  override tokenize(query: string) {
+    return query.split(/\s+/)
+  }
+
   async get(query: ImageSource.Query): Promise<ImageSource.Result[]> {
     const proxy = typeof this.config.proxy === 'string' ? this.config.proxy : this.config.proxy?.endpoint
     const param: Lolicon.Request = {
diff --git a/packages/pixiv/src/index.ts b/packages/pixiv/src/index.ts
index eafa4eb9c..954031a24 100644
--- a/packages/pixiv/src/index.ts
+++ b/packages/pixiv/src/index.ts
@@ -20,6 +20,10 @@ class PixivImageSource extends ImageSource<PixivImageSource.Config> {
     this.refreshToken = config.token
   }
 
+  override tokenize(query: string) {
+    return query.split(/\s+/)
+  }
+
   async get(query: ImageSource.Query): Promise<ImageSource.Result[]> {
     const url = '/v1/search/illust'
     const params: PixivAppApi.SearchParams = {