Water Two Bureau and Water in a Four Pillars chart answer different questions.
Water Two Bureau is a Zi Wei Dou Shu chart calculation label. It is not a count of Water in a Four Pillars chart. The same element word can serve different calculation systems. Keep the bureau, primary star placement, and decade start in one record; keep any Four Pillars element analysis in another.
Keep the Zi Wei bureau calculation separate from Four Pillars element analysis. Similar element names do not answer the same personal or career question.