added required support for queries

Opened PR for feedback
Indent the right brace the same as the start of the line where the left brace is.