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

Thanks for the clarification. That makes a lot of sense. I your strategy.