I remember it being like that, and that you can sell the empty sceptre as jewellery. Perhaps the name just needs to change once the charges have been used up. However, it’s illogical that the feedback refers to a ‘wand’ rather than a ‘sceptre’.
Unlimited charges wouldn’t be a good idea – I agree with you there.