added the query at sample level based on fields. 

It is very limited on purpose, I'll open more functions if they are needed.
aaah ok. the commented line is not part of  your <comment on this line> post, so I thought it was the other one. Sorry about that.

If you want to look at the charon PRs, you might want to look at this week, since they have been piling up