Fixed package name
Updated for query document
Updated for query

- Use query context for title
- Use query context for template