If you use Advent Axys or APX you can filter on your shortcodes for navigating faster and linking them to packages.
- Edit package
- Click on the properties icon next to the macro set you want to link shortcodes to
- Click Filter button
- Enter part of a shortcode and the list will filter and display shortcodes that contain what you type