diff --git a/src/commands/subscription/area/collect_detail.js b/src/commands/subscription/area/collect_detail.js
index 250bd92..8d58562 100644
--- a/src/commands/subscription/area/collect_detail.js
+++ b/src/commands/subscription/area/collect_detail.js
@@ -99,9 +99,17 @@ module.exports = async (WDR, Functions, type, member, message, object, requireme
             // FILTER COLLECT EVENT
             collector.on('collect', CollectedMsg => {
 
-                CollectedMsg.delete();
+                if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
+                    try {
+                        CollectedMsg.delete();
+                    // eslint-disable-next-line no-empty
+                    } catch (e) {
+
+                    }
+                }
 
                 switch (true) {
+                    case CollectedMsg.content.startsWith(WDR.Config.PREFIX):
                     case CollectedMsg.content.toLowerCase() == 'cancel':
                         collector.stop('cancel');
                         break;
@@ -157,4 +165,4 @@ module.exports = async (WDR, Functions, type, member, message, object, requireme
             });
         });
     });
-};
\ No newline at end of file
+};
diff --git a/src/commands/subscription/area/collect_option.js b/src/commands/subscription/area/collect_option.js
index f2c8874..0e67ed3 100644
--- a/src/commands/subscription/area/collect_option.js
+++ b/src/commands/subscription/area/collect_option.js
@@ -11,10 +11,16 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)
     // FILTER COLLECT EVENT
     collector.on('collect', CollectedMsg => {
 
-        if (BotMsg.channel.type != 'dm') {
-            CollectedMsg.delete();
+        if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX && BotMsg.channel.type != 'dm')) {
+            try {
+                CollectedMsg.delete();
+            // eslint-disable-next-line no-empty
+            } catch (e) {
+
+            }
         }
 
+
         switch (CollectedMsg.content.toLowerCase()) {
             case 'add':
                 collector.stop('add');
@@ -28,6 +34,8 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)
             case 'cancel':
                 collector.stop('cancel');
                 break;
+            default:
+                collector.stop('cancel');
         }
     });
 
@@ -39,6 +47,8 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)
         }
 
         switch (msg) {
+            case 'cancel':
+                return Functions.Cancel(WDR, Functions, OriginalMsg, Member);
             case 'add':
                 return Functions.Add(WDR, Functions, OriginalMsg, Member, AreaArray);
             case 'distance':
@@ -61,4 +71,4 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)
 
     // END
     return;
-};
\ No newline at end of file
+};
diff --git a/src/commands/subscription/location/collect_detail.js b/src/commands/subscription/location/collect_detail.js
index fb41dca..b071d30 100644
--- a/src/commands/subscription/location/collect_detail.js
+++ b/src/commands/subscription/location/collect_detail.js
@@ -98,14 +98,17 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, l
 
             collector.on('collect', async CollectedMsg => {
 
-                try {
-                    CollectedMsg.delete();
-                // eslint-disable-next-line no-empty
-                } catch (e) {
+                if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
+                    try {
+                        CollectedMsg.delete();
+                    // eslint-disable-next-line no-empty
+                    } catch (e) {
 
+                    }
                 }
 
                 switch (true) {
+                    case CollectedMsg.content.startsWith(WDR.Config.PREFIX):
                     case CollectedMsg.content.toLowerCase() == 'cancel':
                         collector.stop('cancel');
                         break;
@@ -228,4 +231,4 @@ async function generate_body(WDR, Message, location) {
             return resolve(body);
         });
     });
-}
\ No newline at end of file
+}
diff --git a/src/commands/subscription/location/collect_option.js b/src/commands/subscription/location/collect_option.js
index 966566b..0478a15 100644
--- a/src/commands/subscription/location/collect_option.js
+++ b/src/commands/subscription/location/collect_option.js
@@ -10,11 +10,13 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)
     // FILTER COLLECT EVENT
     collector.on('collect', CollectedMsg => {
 
-        try {
-            CollectedMsg.delete();
-        // eslint-disable-next-line no-empty
-        } catch (e) {
+        if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
+            try {
+                CollectedMsg.delete();
+            // eslint-disable-next-line no-empty
+            } catch (e) {
 
+            }
         }
 
         switch (CollectedMsg.content.toLowerCase()) {
@@ -33,6 +35,8 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)
             case 'view':
                 collector.stop('view');
                 break;
+            default:
+                collector.stop('cancel');
         }
     });
 
@@ -49,6 +53,8 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)
         }
 
         switch (msg) {
+            case 'cancel':
+                return Functions.Cancel(WDR, Functions, OriginalMsg, Member);
             case 'create':
                 return Functions.Create(WDR, Functions, OriginalMsg, Member, AreaArray);
             case 'remove':
@@ -73,4 +79,4 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)
 
     // END
     return;
-};
\ No newline at end of file
+};
diff --git a/src/commands/subscription/pokemon/collect_detail.js b/src/commands/subscription/pokemon/collect_detail.js
index 68d885a..7690131 100644
--- a/src/commands/subscription/pokemon/collect_detail.js
+++ b/src/commands/subscription/pokemon/collect_detail.js
@@ -169,16 +169,18 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
 
             collector.on('collect', async CollectedMsg => {
 
-                try {
-                    CollectedMsg.delete();
-                // eslint-disable-next-line no-empty
-                } catch (e) {
+                if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
+                    try {
+                        CollectedMsg.delete();
+                    // eslint-disable-next-line no-empty
+                    } catch (e) {
 
+                    }
                 }
 
                 switch (true) {
 
-
+                    case CollectedMsg.content.startsWith(WDR.Config.PREFIX):
                     case CollectedMsg.content.toLowerCase() == 'stop':
                     case CollectedMsg.content.toLowerCase() == 'cancel':
                         collector.stop('cancel');
@@ -482,4 +484,4 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
         // END
         return;
     });
-};
\ No newline at end of file
+};
diff --git a/src/commands/subscription/pokemon/collect_option.js b/src/commands/subscription/pokemon/collect_option.js
index e578f16..d617b29 100644
--- a/src/commands/subscription/pokemon/collect_option.js
+++ b/src/commands/subscription/pokemon/collect_option.js
@@ -9,14 +9,14 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member) => {
     });
 
     collector.on('collect', CollectedMsg => {
+        if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
+            try {
+                CollectedMsg.delete();
+            // eslint-disable-next-line no-empty
+            } catch (e) {
 
-        try {
-            CollectedMsg.delete();
-        // eslint-disable-next-line no-empty
-        } catch (e) {
-
+            }
         }
-
         let input = CollectedMsg.content.split(' ').toString().toLowerCase();
 
         let adv_words = ['adv'],
@@ -97,4 +97,4 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member) => {
 
     // END
     return;
-};
\ No newline at end of file
+};
diff --git a/src/commands/subscription/pvp/collect_detail.js b/src/commands/subscription/pvp/collect_detail.js
index a88ae50..89f3aba 100644
--- a/src/commands/subscription/pvp/collect_detail.js
+++ b/src/commands/subscription/pvp/collect_detail.js
@@ -160,17 +160,20 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
             // FILTER COLLECT EVENT
             collector.on('collect', async CollectedMsg => {
 
-                try {
-                    CollectedMsg.delete();
-                // eslint-disable-next-line no-empty
-                } catch (e) {
+                if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
+                    try {
+                        CollectedMsg.delete();
+                    // eslint-disable-next-line no-empty
+                    } catch (e) {
 
+                    }
                 }
 
                 let old_data;
 
                 switch (true) {
 
+                    case CollectedMsg.content.startsWith(WDR.Config.PREFIX):
                     case CollectedMsg.content.toLowerCase() == 'stop':
                     case CollectedMsg.content.toLowerCase() == 'cancel':
                         collector.stop('cancel');
@@ -410,4 +413,4 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
         // END
         return;
     });
-};
\ No newline at end of file
+};
diff --git a/src/commands/subscription/pvp/collect_option.js b/src/commands/subscription/pvp/collect_option.js
index f9f81b2..62c5649 100644
--- a/src/commands/subscription/pvp/collect_option.js
+++ b/src/commands/subscription/pvp/collect_option.js
@@ -10,11 +10,13 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member) => {
 
     collector.on('collect', CollectedMsg => {
 
-        try {
-            CollectedMsg.delete();
-        // eslint-disable-next-line no-empty
-        } catch (e) {
+        if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
+            try {
+                CollectedMsg.delete();
+            // eslint-disable-next-line no-empty
+            } catch (e) {
 
+            }
         }
 
         let input = CollectedMsg.content.split(' ')[0].toString().toLowerCase();
@@ -95,4 +97,4 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member) => {
 
     // END
     return;
-};
\ No newline at end of file
+};
diff --git a/src/commands/subscription/quest/collect_detail.js b/src/commands/subscription/quest/collect_detail.js
index 2a31226..823923a 100644
--- a/src/commands/subscription/quest/collect_detail.js
+++ b/src/commands/subscription/quest/collect_detail.js
@@ -80,15 +80,18 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
 
             collector.on('collect', async CollectedMsg => {
 
-                try {
-                    CollectedMsg.delete();
-                // eslint-disable-next-line no-empty
-                } catch (e) {
+                if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
+                    try {
+                        CollectedMsg.delete();
+                    // eslint-disable-next-line no-empty
+                    } catch (e) {
 
+                    }
                 }
 
                 switch (true) {
 
+                    case CollectedMsg.content.startsWith(WDR.Config.PREFIX):
                     case CollectedMsg.content.toLowerCase() == 'stop':
                     case CollectedMsg.content.toLowerCase() == 'cancel':
                         collector.stop('cancel');
@@ -220,8 +223,17 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
 
                     }
                 }
-                return resolve(reason);
+                switch (reason) {
+                    case 'cancel':
+                        Functions.Cancel(WDR, Functions, Message, Member, 'Quest');
+                        return null;
+                    case 'time':
+                        Functions.TimedOut(WDR, Functions, Message, Member, 'Quest');
+                        return null;
+                    default:
+                        return resolve(reason);
+                }
             });
         });
     });
-};
\ No newline at end of file
+};
diff --git a/src/commands/subscription/quest/collect_option.js b/src/commands/subscription/quest/collect_option.js
index bc0f578..0d32bea 100644
--- a/src/commands/subscription/quest/collect_option.js
+++ b/src/commands/subscription/quest/collect_option.js
@@ -10,11 +10,13 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member) => {
 
     collector.on('collect', CollectedMsg => {
 
-        try {
-            CollectedMsg.delete();
-        // eslint-disable-next-line no-empty
-        } catch (e) {
+        if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
+            try {
+                CollectedMsg.delete();
+            // eslint-disable-next-line no-empty
+            } catch (e) {
 
+            }
         }
 
         let input = CollectedMsg.content.split(' ')[0].toString().toLowerCase();
@@ -50,6 +52,8 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member) => {
             case resume_words.some(word => input.includes(word)):
                 collector.stop('resume');
                 break;
+            default:
+                collector.stop('cancel');
         }
     });
 
@@ -88,4 +92,4 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member) => {
 
     // END
     return;
-};
\ No newline at end of file
+};
diff --git a/src/commands/subscription/raid/collect_detail.js b/src/commands/subscription/raid/collect_detail.js
index a02e539..781ff9a 100644
--- a/src/commands/subscription/raid/collect_detail.js
+++ b/src/commands/subscription/raid/collect_detail.js
@@ -101,15 +101,17 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
             // FILTER COLLECT EVENT
             collector.on('collect', async CollectedMsg => {
 
-                try {
-                    CollectedMsg.delete();
-                // eslint-disable-next-line no-empty
-                } catch (e) {
+                if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
+                    try {
+                        CollectedMsg.delete();
+                    // eslint-disable-next-line no-empty
+                    } catch (e) {
 
+                    }
                 }
 
                 switch (true) {
-
+                    case CollectedMsg.content.startsWith(WDR.Config.PREFIX):
                     case CollectedMsg.content.toLowerCase() == 'stop':
                     case CollectedMsg.content.toLowerCase() == 'cancel':
                         collector.stop('cancel');
@@ -316,8 +318,18 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
 
                     }
                 }
-                return resolve(reason);
+
+                switch (reason) {
+                    case 'cancel':
+                        Functions.Cancel(WDR, Functions, Message, Member, 'Raid');
+                        return null;
+                    case 'time':
+                        Functions.TimedOut(WDR, Functions, Message, Member, 'Raid');
+                        return null;
+                    default:
+                        return resolve(reason);
+                }
             });
         });
     });
-};
\ No newline at end of file
+};
diff --git a/src/commands/subscription/raid/collect_option.js b/src/commands/subscription/raid/collect_option.js
index 985c0cd..e24e3a5 100644
--- a/src/commands/subscription/raid/collect_option.js
+++ b/src/commands/subscription/raid/collect_option.js
@@ -10,11 +10,13 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, gym_name_a
 
     collector.on('collect', CollectedMsg => {
 
-        try {
-            CollectedMsg.delete();
-        // eslint-disable-next-line no-empty
-        } catch (e) {
+        if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
+            try {
+                CollectedMsg.delete();
+            // eslint-disable-next-line no-empty
+            } catch (e) {
 
+            }
         }
 
         let input = CollectedMsg.content.split(' ')[0].toString().toLowerCase();
@@ -49,6 +51,8 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, gym_name_a
             case resume_words.some(word => input.includes(word)):
                 collector.stop('resume');
                 break;
+            default:
+                collector.stop('cancel');
         }
     });
 
@@ -89,4 +93,4 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, gym_name_a
 
     // END
     return;
-};
\ No newline at end of file
+};