Goal | is of type | Long-term
etc (i.e Short-term, Lifelong, None, or "is not" of that type)
and, for all text based fields - Folder, Context, Goal etc - the same flexible options as for Task and Tag, e.g "begins with", "contains" etc. This would make it possible to take advantage of more systematic naming schemes for these fields.