Improve code consistency for search navigation

Description

This is a refactor to improve the code consistency for the search navigation. Follow-up from !179028 (merged).

Related to #511347 (closed)