GLRIDB-414 refactor and merge search with browse while making browse first class

YES! Agree.