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

Nice catch. At one point they were. This is a good clean up.