diff --git a/README.md b/README.md
index 068107cd26ed3b430cac6e65cb41b35e96cc6847..37ada6b99bdb9ae9c0ae3b740d08e664c641c240 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,6 @@
 [![GitHub stars](https://img.shields.io/github/stars/wechaty/wechaty.svg?label=github%20stars)](https://github.com/wechaty/wechaty)
 [![Docker Pulls](https://img.shields.io/docker/pulls/zixia/wechaty.svg?maxAge=2592000)](https://hub.docker.com/r/zixia/wechaty/)
 [![TypeScript](https://img.shields.io/badge/%3C%2F%3E-TypeScript-blue.svg)](https://www.typescriptlang.org/)
-[![Greenkeeper badge](https://badges.greenkeeper.io/wechaty/wechaty.svg)](https://greenkeeper.io/)
 [![Gitter](https://badges.gitter.im/Chatie/wechaty.svg)](https://gitter.im/Chatie/wechaty?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 ## Connecting Chatbots
diff --git a/package.json b/package.json
index 27fe5f5636fd134c4998b53101612a001753fa50..34db50bae17adf01c519a3353c7a78f4d1bbe034 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wechaty",
-  "version": "0.35.9",
+  "version": "0.35.14",
   "description": "Wechaty is a Bot SDK for Individual Account, Powered by TypeScript, Docker, and 💖",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
diff --git a/src/user/message.ts b/src/user/message.ts
index 98c7e8832752226c406c3efcd14f5ff1435a3f42..08306c463c384e3e04ed0be6053e492afc289dff 100644
--- a/src/user/message.ts
+++ b/src/user/message.ts
@@ -57,14 +57,6 @@ import {
 }                       from './mini-program'
 import { Image } from './image'
 
-export interface MessageUserQueryFilter {
-  from? : Contact,
-  text? : string | RegExp
-  room? : Room
-  type? : MessageType
-  to?   : Contact
-}
-
 /**
  * All wechat messages will be encapsulated as a Message.
  *
@@ -87,16 +79,16 @@ export class Message extends Accessory implements Sayable {
    * Find message in cache
    */
   public static async find<T extends typeof Message> (
-    this      : T,
-    userQuery : string | MessageUserQueryFilter,
+    this  : T,
+    query : string | MessageQueryFilter,
   ): Promise<T['prototype'] | null> {
-    log.verbose('Message', 'find(%s)', JSON.stringify(userQuery))
+    log.verbose('Message', 'find(%s)', JSON.stringify(query))
 
-    if (typeof userQuery === 'string') {
-      userQuery = { text: userQuery }
+    if (typeof query === 'string') {
+      query = { text: query }
     }
 
-    const messageList = await this.findAll(userQuery)
+    const messageList = await this.findAll(query)
     if (messageList.length < 1) {
       return null
     }
@@ -112,27 +104,15 @@ export class Message extends Accessory implements Sayable {
    * Find messages in cache
    */
   public static async findAll<T extends typeof Message> (
-    this       : T,
-    userQuery? : MessageUserQueryFilter,
+    this   : T,
+    query? : MessageQueryFilter,
   ): Promise<Array<T['prototype']>> {
-    log.verbose('Message', 'findAll(%s)', JSON.stringify(userQuery) || '')
-
-    let puppetQuery: undefined | MessageQueryFilter
-
-    if (userQuery) {
-      puppetQuery = {
-        fromId : userQuery.from && userQuery.from.id,
-        roomId : userQuery.room && userQuery.room.id,
-        text   : userQuery.text,
-        toId   : userQuery.to && userQuery.to.id,
-        type   : userQuery.type,
-      }
-    }
+    log.verbose('Message', 'findAll(%s)', JSON.stringify(query) || '')
 
     const invalidDict: { [id: string]: true } = {}
 
     try {
-      const MessageIdList = await this.puppet.messageSearch(puppetQuery)
+      const MessageIdList = await this.puppet.messageSearch(query)
       const messageList = MessageIdList.map(id => this.load(id))
       await Promise.all(
         messageList.map(