在名词性从句中that可以省略吗？THAT在名词性从句中不充当任何成分？which在名词性从句中充当成分吗？

如题
In some countries, what is called “equality” does not really mean equal rights for all people.

在what is called “equality”这个句子中，主谓宾分别是什么？

Coffee or tea，which one is better makes me in trouble。

后面半句中的主谓宾分别是什么

在what is called “equality”这个句子中
主语是 what

在which one is better makes me in trouble中
主语是which one is better，语动词是makes ，me是make 的宾语，in trouble在一定程度上算是宾补吧。

that在名词性从句中不充当成分
在有的名词性从句中that可以省略，例如如果一个动词后接两个或两个以上的宾语从句时，第一个宾语从句的that可以省略。
He told me (that)he had two sons and that they both had gone to college.

which 在名词性从句中充当成分，
He has read the books. But he still doesn't know which book is better.( 在此句中which从句是know的宾语，which在从句中做定语 )

不充当

在名词性从句中that即使不充当任何成分都不可以省略，它是名词性从句的一个标志，除非是informal English。在what is called “equality”这个句子中，what 做主语，is called做谓语，equality做宾补。which one is better makes me in trouble，这句中which one is better做主语，叫主语从句。make做谓语，me做宾语，in trouble做宾补

第一个句子： 主语：what is called “equality” 谓语：does not really mean 宾语：equal rights for all people. 翻译成中文是：在一些国家，所谓平等并不意味着所的人权利都平等。 第二个句子： 主：Coffee or tea，which one is better 谓：makes 宾：me 翻成中文：咖啡和茶，那一样更好使我们感觉很麻烦。

不充当