Better recognition of commands

If I want to use a hyphenated command, for example the "add-to-calendar" command, Ubiquity forces me to start typing "add" in order to use it. This seems counter-intuitive to me - I am much more likely to start typing "calendar" (then use the arrow keys to specify whether I mean "add-to" or "check". However, it doesn't work like this, and typing "calendar" will simply start searching google for the word calendar.