diff --git a/src/discord/MusicPlayer/Play.ts b/src/discord/MusicPlayer/Play.ts
index 0b6e38d..27f2e07 100644
--- a/src/discord/MusicPlayer/Play.ts
+++ b/src/discord/MusicPlayer/Play.ts
@@ -132,7 +132,7 @@ export default class Play {
                 //return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.MSINFO(data)] });
                 return;
             }
-            query = args[0];
+            query = args.join(' ');
 
         }
         else if (isSlashCommand) {
@@ -180,7 +180,10 @@ export default class Play {
             if (!result) return;
             instance.addTrackToQueue(result[0]);
 
-            // TODO: Let user choose the video
+            if(result.length > 1) {
+                // TODO: Let user choose the video
+            }
+            
             return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.ADDED_QUEUE(data, result[0])] });
         }
 
diff --git a/src/discord/MusicPlayer/Search.ts b/src/discord/MusicPlayer/Search.ts
index 54ea4d1..a14d64f 100644
--- a/src/discord/MusicPlayer/Search.ts
+++ b/src/discord/MusicPlayer/Search.ts
@@ -79,7 +79,7 @@ export default class Search {
                 //return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.MSINFO(data)] });
                 return;
             }
-            query = args[0];
+            query = args.join(' ');
 
         }
         else if (isSlashCommand) {