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

Yes there is and I considered directly using it - it was easier to fist make this migration.