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

I agree. This is an initial step towards that goal. I first identified items that need to be shared.