hz_cust_acct_sites_all.bill_to_flag is set to null on all account sites when only one is updated

I have a customer account with one Active Primary Bill TO and one inactive Bill TO. When i updated a value(sales person) on the inactive Bill To, the Active record in hz_cust_acct_sites_all got updated as well and the bill_to_flag that was P became null.

It looks like this was a bug earlier. Is there any workaround for this without applying the patch.

How can I get the value on the column to P for the active record, that I did not even update. some of our existing queries are not returning a value for the active record that was not updated because we have a check hcas.bill_to_flag = 'P'