How to pass variable for Hirearchy and hierarchy node in WAD7 API

I have a case where I need to pass as variable for both the hierarchy and the hierarchy node.
When I pass both of them as string variable it works ok initially, but when I have a personalized version of the web template it does not use the new hierarchy passed. It uses the new Hierarchy node, but keeps the old hierarchy that was used when the personalization took place.

In the query the filter shows like this: ZSWBSH([ZHWBSHIER])  ZSWBSH is for the node, and ZHWBSHIER is the variable for the hierarchy.

I see there is a special variable type for hierarchy variable, I tried that for the variable that selects the hierarchy without success.

Is  variable type HIERARCHY_VARIABLE meant for the hierarchy node or the hierarchy itself?

Any suggestion on what is the correct method to pass variables for the hierarchy and the hierarchy node?

I am using JavaScript to Set web template (SET_TEMPLATE) before I pass/set  the variables (SET_VARIABLE_STATE).

It works fine as long as the template has not been personalized. When personalized it uses the new hierarchy node passed in the SET_VARIABLE_STATE command, but ignores the hierarchy variable passed in the same command.

Thanks for any help,
Torbjørn.