True, but I have seen rapiers that are more affiliated to slashing rather than thrusting.  A few German made rapiers are like that with a wider though considerably shorter blade than most English or Italian rapiers, but I do see your point with the handguard being more associated with a saber than a rapier, so I just placed it under sword.  Also I made a few slight adjustments to my CS.