This fixes the compiler complaining about the arguments not living long enough or escaping the function.
Now the query functions can take external arguments and compose well together.

Fixes #28