In query

Fixes #31
Fixes #8