More specific MBIDs (fix #9, fix #10)