add. query sub-package
fix. some syntax and dependencies.