Exclude more things from name matching