MBS-6588: correctly group/rank by entity, rather than by name, in direct search
MBS-6588: Undo changes for recording/release/release group search
Merge branch 'mbs-6588' into beta

* mbs-6588:
  MBS-6588: Undo changes for recording/release/release group search
  MBS-6588: correctly group/rank by entity, rather than by name, in direct search