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

Exactly. I tried to move this to SB but had trouble getting in there within the time constraints. I will have time this next iteration to get some of this done.