diff --git a/src/main/java/com/thealgorithms/searches/BreadthFirstSearch.java b/src/main/java/com/thealgorithms/searches/BreadthFirstSearch.java
index debab98c67a8..7ac9c7b01526 100644
--- a/src/main/java/com/thealgorithms/searches/BreadthFirstSearch.java
+++ b/src/main/java/com/thealgorithms/searches/BreadthFirstSearch.java
@@ -3,37 +3,54 @@
 import com.thealgorithms.datastructures.Node;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Queue;
+import java.util.Set;
 
 /**
- * @author: caos321
- * @date: 31 October 2021 (Sunday)
- * @wiki: https://en.wikipedia.org/wiki/Breadth-first_search
+ * Breadth-First Search implementation for tree/graph traversal.
+ * @author caos321
+ * @co-author @manishraj27
+ * @see <a href="https://en.wikipedia.org/wiki/Breadth-first_search">Breadth-first search</a>
  */
 public class BreadthFirstSearch<T> {
-
     private final List<T> visited = new ArrayList<>();
+    private final Set<T> visitedSet = new HashSet<>();
 
-    public Optional<Node<T>> search(final Node<T> node, final T value) {
-        if (node == null) {
+    /**
+     * Performs a breadth-first search to find a node with the given value.
+     *
+     * @param root The root node to start the search from
+     * @param value The value to search for
+     * @return Optional containing the found node, or empty if not found
+     */
+    public Optional<Node<T>> search(final Node<T> root, final T value) {
+        if (root == null) {
             return Optional.empty();
         }
-        if (node.getValue().equals(value)) {
-            // add root node to visited
-            visited.add(value);
-            return Optional.of(node);
-        }
-        visited.add(node.getValue());
 
-        Queue<Node<T>> queue = new ArrayDeque<>(node.getChildren());
+        visited.add(root.getValue());
+        visitedSet.add(root.getValue());
+
+        if (root.getValue() == value) {
+            return Optional.of(root);
+        }
 
+        Queue<Node<T>> queue = new ArrayDeque<>(root.getChildren());
         while (!queue.isEmpty()) {
             final Node<T> current = queue.poll();
-            visited.add(current.getValue());
+            T currentValue = current.getValue();
+
+            if (visitedSet.contains(currentValue)) {
+                continue;
+            }
+
+            visited.add(currentValue);
+            visitedSet.add(currentValue);
 
-            if (current.getValue().equals(value)) {
+            if (currentValue == value || (value != null && value.equals(currentValue))) {
                 return Optional.of(current);
             }
 
@@ -43,6 +60,11 @@ public Optional<Node<T>> search(final Node<T> node, final T value) {
         return Optional.empty();
     }
 
+    /**
+     * Returns the list of nodes in the order they were visited.
+     *
+     * @return List containing the visited nodes
+     */
     public List<T> getVisited() {
         return visited;
     }