Revert "Revert "Corrected bug #1""
Revert "Revert "Corrected bug #1""

This reverts commit 1aff5b8ff8154cc927f6e527bb125b9594447465.

SmartSearch/Edge-Node,SmartSearch/Edge-Node,SmartSearch/Edge-Node,SmartSearch/Edge-Node,SmartSearch/Edge-Node