added required support for queries

Opened PR for feedback
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.