Fix type filtering