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

Again, seems like internal state rather than shared state.