Yes the UK census ran 2 questions which was in part supposed to cover the information gap State agencies has under Equality Act 2010.
The ONS opted for 2 gender identity question on being "trans" the second question asked people to lable themselves.
They were warned in advance that the question was badly worded and would likely produce no usefull information.
This proved to be true and the collected data was downgraded.
The list of lables can even be downloaded and the data is interesting in so far as the staff had to fit them into 4 Gender Identy classes 2 of which have no legal protections under the Equality Act 2010.