One of the flaws in MiFID I was that it missed out some of the newer fast growing markets like ETFs.  MiFID II corrects this by covering nearly everything but grasping which products are covered by which parts is not simple.  Here is a diagram that shows what is under which parts of the regime.