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

I am amenable to any file name clarifications.