[FIX] XQuery, finding similar functions names (discovered by @holu)
[MIN] comment
[FIX] Commands, CHOP=false: string check revised