Fix Nodes, Menus, Vocabulary block filters

This fixes the blocks in 1.5 not being filtered.

Later, I want to refactor how blocks are processed. Currently there is a lot of logic duplication that should be put into the common libs.