I think the second weapon look more like a Spear rather than a Staff.

Your opinion ?

Could go either way, really. I don't see much problem with adding both tags as long as it's not obviously one or the other.