Fix infrastructure main type filter (fixes #1096)