diff --git a/puppetboard/app.py b/puppetboard/app.py
index 583e826..91042ae 100644
--- a/puppetboard/app.py
+++ b/puppetboard/app.py
@@ -723,7 +723,9 @@ def query(env):
 
         form = QueryForm(csrf_enabled=False)
         if form.validate_on_submit():
-            if form.query.data[0] == '[':
+            if form.endpoints.data == 'pql':
+                query = form.query.data
+            elif form.query.data[0] == '[':
                 query = form.query.data
             else:
                 query = '[{0}]'.format(form.query.data)
diff --git a/puppetboard/forms.py b/puppetboard/forms.py
index 3d80162..a5cff3c 100644
--- a/puppetboard/forms.py
+++ b/puppetboard/forms.py
@@ -25,6 +25,7 @@ class QueryForm(Form):
         ('catalogs', 'Catalogs'),
         ('edges', 'Edges'),
         ('environments', 'Environments'),
+        ('pql', 'PQL'),
         ])
     rawjson = BooleanField('Raw JSON')
 
diff --git a/requirements.txt b/requirements.txt
index 8c2134a..68a2873 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,5 @@ MarkupSafe==0.19
 WTForms==1.0.5
 Werkzeug==0.9.4
 itsdangerous==0.23
-pypuppetdb==0.2.1
+pypuppetdb==0.3.1
 requests==2.6.0