This would be one good fix, tho some would complain that it is too easy to HQ everything since every item will be considered +3. I like it tho. Will save much inv space, and involve less variables in the coding.