issue #11: support for custom queries