Unarmed need Weapon Lock aswell. Cant Generate Combo Points between sets

So like in the title cant generate combo between sets in Hollow Palm. Ive got a steup where my Tempest Flurry is suposed to generate combo points for my Frozen Locus to generate power charges. Im using those skills in separate weapon sets to utilize weapon set skill points in the skill tree like more frost buildup for Weapon Set 1 and Shock Magnitude for Weapon Set 2. Not sure whether it is intended but boy it is annoying :D A Weapon Lock or default setting for unnarmed would be welcome. Thank you