Weapon Sets Keep dropping

I have spear & shield for weapon set 1 & a crossbow for 2. I keep looking at passive tree and I am loosing the 12 points I have applied to either set. Tried to fix today and now I have lost all dps numbers with all weapon set passives removed & the cross bow unequipped. The problem appeared when I deselected Barrage from weapon set 2. I could not put it back on!

Equally, it is frustating that the Crossbow has +29 strength but I have to change the passive tree attribute nodes to strength and then equip and then return the nodes.