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

Excellent!  This was a kludge on my part, having this whole thing crammed into one big controller.