Macro suggestions filtered and sorted by both label and arg signature

Macro suggestions filtered and sorted by both label and arg signature #2609