Move query objects out of path, Fixes #76