Moved the ignore attribute and type filtering to an earlier point.