Fixes #5635: Repair search node component
Merge pull request #632 from VinceMacBuche/ust_5537/5635/fix_search

Fixes #5635: Repair search node component