MBS-6537, searching for an MBID should also find tracks.
Merge branch 'mbs-6537' into beta

* mbs-6537:
  MBS-6537, searching for an MBID should also find tracks.