Confusing Questions/Labels for Deceased Clients

I'm not clear about some of the field within the Basic Details section for when one member of a couple dies. The question 'Is this person married to their partner' is confusing. They were when alive but obviously not now! What is meant to go into that field. It would be helpful if by stating that the client is deceased, either a new question comes up such as ‘Was the client married to their Partner at the time of their death?’ and/or maybe have another toggle for ‘Is this person married to their partner’ Yes/No/Yes at time of death. Likewise, 'Marital Status' - clearly one is Widowed but what do you enter for the deceased? Maybe have Deceased as an option there or again, Previously Married to their partner.