Revert topic 'refactor-search-path-construction'

It will be revised and restored after dashboard fixes.
Merge topic 'refactor-search-path-construction' into next

7d9961e7 Revert topic 'refactor-search-path-construction'