added mbid query
conflict resolved