Type filtering was simplified in the layout class.