Make query more generics, and use them for everything.

[just1602]

• query should return a list of index
• query should always consider subject

That way it would be possible to do something like todors do some task subject and it'd be as valid as todors do 1,3