Optimize match engine for remixes

and fix bug with Mp3Clan