Need to filter by type here, not by check