diff --git a/package.json b/package.json
index 2e937b7..e846a07 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wump",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "displayName": "Wump",
   "description": "A multi-platform bot written in Node.js",
   "author": "Wessel \"wesselgame\" T <discord@go2it.eu>",
diff --git a/src/assets/config/emotes.yml b/src/assets/config/emotes.yml
index 0426276..37f73ec 100644
--- a/src/assets/config/emotes.yml
+++ b/src/assets/config/emotes.yml
@@ -39,10 +39,11 @@ info:
     8          : <:store:542366547180781588>       # Owner avatar
     9          : <:bot:473670328334155805>         # Total bots
     10         : <:member:542362747896201218>      # Total users
-    11         : <:offline:362670805441708032>     # Total offline members
-    12         : <:online:362670805051768833>      # Total online members
+    11         : <:online:362670805051768833>      # Total online members
+    12         : <:idle:362670805760475136>        # Total idle members
     13         : <:dnd:362670805676720128>         # Total DnD members
-    14         : <:idle:362670805760475136>        # Total idle members
+    14         : <:offline:362670805441708032>     # Total offline members
+    15         : <:exclamation:542368036255039509> # Invalid query
   commands     :
     0          : <:blueberry:506201160382939141> # Guild prefix
     1          : <:spirit:332131321759399937>    # More info
diff --git a/src/assets/i18n/en_us/strings.yml b/src/assets/i18n/en_us/strings.yml
index 35a8b2d..b77ecad 100644
--- a/src/assets/i18n/en_us/strings.yml
+++ b/src/assets/i18n/en_us/strings.yml
@@ -102,10 +102,11 @@ info      :
           - '$[emoji#9] Bots **⤏** $[guild:users#bot]'
           - '$[emoji#10] Members **⤏** $[guild:users#total]'
           - '**_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\__**'
-          - '$[emoji#12] Online **⤏** `$[guild:users#online]`'
-          - '$[emoji#14] Idle **⤏** `$[guild:users#idle]`'
+          - '$[emoji#11] Online **⤏** `$[guild:users#online]`'
+          - '$[emoji#12] Idle **⤏** `$[guild:users#idle]`'
           - '$[emoji#13] DnD **⤏** `$[guild:users#dnd]`'
-          - '$[emoji#11] Offline **⤏** `$[guild:users#offline]`'
+          - '$[emoji#14] Offline **⤏** `$[guild:users#offline]`'
+    invalid: '$[emoji#15] No guild found with your query'
 
 image:
     fetching	  : '$[emoji#0] Fetching a random image, this may take some time...'
diff --git a/src/assets/i18n/nl/strings.yml b/src/assets/i18n/nl/strings.yml
index c0b37eb..7021afd 100644
--- a/src/assets/i18n/nl/strings.yml
+++ b/src/assets/i18n/nl/strings.yml
@@ -105,6 +105,7 @@ info      :
           - '$[emoji#14] Idle **⤏** `$[guild:users#idle]`'
           - '$[emoji#13] DnD **⤏** `$[guild:users#dnd]`'
           - '$[emoji#11] Offline **⤏** `$[guild:users#offline]`'
+    invalid: '$[emoji#15] Geen gilde gevonden met uw zoekopdracht'
 
 image:
     fetching	  : '$[emoji#0] Een willekeurig plaatje aan het ophalen, dit kan enige tijd duren...'
diff --git a/src/commands/Discord/Information/guild.js b/src/commands/Discord/Information/guild.js
index 9c09ced..303b664 100644
--- a/src/commands/Discord/Information/guild.js
+++ b/src/commands/Discord/Information/guild.js
@@ -31,7 +31,7 @@ module.exports = class name extends DiscordCommand {
   async execute(msg, args) {
     const g = this.bot.REST.getGuild((args.length >= 1 ? args.join(' ') : msg.channel.guild.id));
     
-    if (!g) return msg.channel.createMessage('INVALID');    
+    if (!g) return msg.channel.createMessage(this.localize(msg.author.locale['info']['guild']['invalid']));    
     msg.channel.createMessage({
       embed: {
         title    : g.name,
@@ -113,6 +113,7 @@ module.exports = class name extends DiscordCommand {
       .replace(/\$\[emoji#11]/g, this.bot.emote('info', 'guild', '11'))
       .replace(/\$\[emoji#12]/g, this.bot.emote('info', 'guild', '12'))
       .replace(/\$\[emoji#13]/g, this.bot.emote('info', 'guild', '13'))
-      .replace(/\$\[emoji#14]/g, this.bot.emote('info', 'guild', '14'));
+      .replace(/\$\[emoji#14]/g, this.bot.emote('info', 'guild', '14'))
+      .replace(/\$\[emoji#15]/g, this.bot.emote('info', 'guild', '15'));
   }
 };
\ No newline at end of file
diff --git a/src/core/internal/Discord/rest.js b/src/core/internal/Discord/rest.js
index dc72da7..3a548dc 100644
--- a/src/core/internal/Discord/rest.js
+++ b/src/core/internal/Discord/rest.js
@@ -37,7 +37,7 @@ module.exports = class RESTclient {
   getGuild($) {
     if (/^\d+$/.test($) && this.bot.guilds.get($)) return this.bot.guilds.get($);
     else {
-      const tmp = this.bot.guilds.filter((v) => v.name.toLowerCase().includes(q.toLowerCase()));
+      const tmp = this.bot.guilds.filter((v) => v.name.toLowerCase().includes($.toLowerCase()));
       if (tmp.length > 0) return tmp[0];
     }