diff --git a/common/.config/nvim/lua/plugins/code-generic.lua b/common/.config/nvim/lua/plugins/code-generic.lua
index d9902d8..1227375 100644
--- a/common/.config/nvim/lua/plugins/code-generic.lua
+++ b/common/.config/nvim/lua/plugins/code-generic.lua
@@ -113,6 +113,8 @@ return {
                     "--column",
                     "--hidden", -- include hidden files
                     "--glob=!.git", -- exclude .git directory
+                    "--glob=!target",
+                    "--glob=!node_modules",
                 },
             },
             signs = false,
@@ -136,8 +138,8 @@ return {
                 desc = "Previous todo comment",
             },
 
-            { "<leader>df", "<cmd>TodoTelescope keywords=FIX,FIXME<cr>", desc = "FIXME: Tags" },
-            { "<leader>dt", "<cmd>TodoTelescope keywords=TODO<cr>", desc = "Project TODOs" },
+            { "<leader>df", "<cmd>TodoTelescope keywords=FIX,FIXME,BUG<cr>", desc = "FIXME: Tags" },
+            { "<leader>dt", "<cmd>TodoTelescope keywords=TODO,FIX,FIXME,BUG<cr>", desc = "Project TODOs" },
             { "<leader>dT", "<cmd>TodoTelescope<cr>", desc = "All tags: FIX, NOTE, TIP, TODO, WARN" },
         },
     },
diff --git a/common/.config/nvim/lua/plugins/navigate-files.lua b/common/.config/nvim/lua/plugins/navigate-files.lua
index db1a547..78a733e 100644
--- a/common/.config/nvim/lua/plugins/navigate-files.lua
+++ b/common/.config/nvim/lua/plugins/navigate-files.lua
@@ -126,6 +126,10 @@ return {
             table.insert(vimgrep_arguments, "--glob")
             -- And to ignore .git directory. Needed since its not `.gitignore`d
             table.insert(vimgrep_arguments, "!**/.git/*")
+            table.insert(vimgrep_arguments, "--glob")
+            table.insert(vimgrep_arguments, "!**/node_modules/*")
+            table.insert(vimgrep_arguments, "--glob")
+            table.insert(vimgrep_arguments, "!**/target/*")
 
             require("telescope").setup({
                 defaults = {
@@ -145,7 +149,7 @@ return {
                     find_files = {
                         hidden = true,
                         -- Redoing the vimgrep_arguments changes for find_files as well
-                        find_command = { "rg", "--files", "--hidden", "--glob", "!**/.git/*" },
+                        find_command = { "rg", "--files", "--hidden", "--glob", "!**/.git/*", "--glob", "!**/node_modules/*", "--glob", "!**/target/*" },
                     },
                 },
                 extensions = {