[QoL] NPC category sorting

A real issue that has been annoying me since the beginning of the game is the way categories are sorted on often used NPC, mostly end game ones.
Is it too complicated to put a category for each primal wearing the name of the primal's token like "Expanse Totem" or "Hive Totem"? This way I can directly understand under which category I have to go to find what i'm looking for with the token I wanna trade in. Corresponding bird could also be moved in instead of putting them all under "Other".
That would actually make us gain so much time instead of searching in each category each time because we don't remind where is what with "Primal Weap" 1, 2, 3 and 4 categories.
This was already a problem with Mor Dhona's NPC, which have been fixed a bit since then, but it still is in Idyllshire, and I don't think I even have to mention the Calamity Salvager, but I think the issue with this one is more about the amount of items it is selling because there already are too many categories there. So please, can you make better sorted and more understandable categories please? For existing NPC and all the new one who are coming in StormBlood.