Revert "Revert "-Fixed bug with multiblock subtype matching""

This reverts commit 4fc0c4fc120cc3221cf3cf4673657e33e70ed38c.