I'd like to suggest grouping up the weapons benefitting from the feat by type. To serve as an example:
Swords (shortsword, longsword, bastard sword, greatsword, rapier),
Axes (handaxe, battleaxe, greataxe, dwarven waraxe, light pick, heavy pick),
Polearms (halberd, scythe, short spear, long...