added generic-layout-* to masquerade block