diff --git a/puppetboard/app.py b/puppetboard/app.py
index 91042ae..d6b8414 100644
--- a/puppetboard/app.py
+++ b/puppetboard/app.py
@@ -17,6 +17,7 @@ from flask import (
     )
 
 from pypuppetdb import connect
+from pypuppetdb.QueryBuilder import *
 
 from puppetboard.forms import (CatalogForm, QueryForm)
 from puppetboard.utils import (
@@ -83,7 +84,7 @@ app.jinja_env.globals['url_for_field'] = url_for_field
 def utility_processor():
     def now(format='%m/%d/%Y %H:%M:%S'):
         """returns the formated datetime"""
-        return datetime.now().strftime(format)
+        return datetime.datetime.now().strftime(format)
     return dict(now=now)
 
 
@@ -153,23 +154,29 @@ def index(env):
         metrics['avg_resources_node'] = "{0:10.0f}".format(
             avg_resources_node['Value'])
     else:
-        conditions = ", ".join('["=", "{0}", "{1}"]'.format(field, env)
-                  for field in ['catalog_environment', 'facts_environment'])
+        query = AndOperator()
+        query.add(EqualsOperator('catalog_environment', env))
+        query.add(EqualsOperator('facts_environment', env))
+
+        num_nodes_query = ExtractOperator()
+        num_nodes_query.add_field(FunctionOperator('count'))
+        num_nodes_query.add_query(query)
+
         if app.config['OVERVIEW_FILTER'] != None:
-            conditions += ", {0}".format(app.config['OVERVIEW_FILTER'])
-        query = '["and", {0}]'.format(conditions)
+             query.add(app.config['OVERVIEW_FILTER'])
+
+        num_resources_query = ExtractOperator()
+        num_resources_query.add_field(FunctionOperator('count'))
+        num_resources_query.add_query(EqualsOperator("environment", env))
+
         num_nodes = get_or_abort(
             puppetdb._query,
             'nodes',
-            query='["extract", [["function", "count"]],["and", {0}]]'.format(
-                    ",".join('["=", "{0}", "{1}"]'.format(field, env)
-                        for field in ['catalog_environment', 'facts_environment'])))
+            query=num_nodes_query)
         num_resources = get_or_abort(
             puppetdb._query,
             'resources',
-            query='["extract", [["function", "count"]],' \
-                '["=", "environment", "{0}"]]'.format(
-                    env))
+            query=num_resources_query)
         metrics['num_nodes'] = num_nodes[0]['count']
         metrics['num_resources'] = num_resources[0]['count']
         try:
@@ -238,9 +245,9 @@ def nodes(env):
     if env == '*':
         query = None
     else:
-        query = '["and", {0}]'.format(
-            ", ".join('["=", "{0}", "{1}"]'.format(field, env)
-                for field in ['catalog_environment', 'facts_environment'])),
+        query = AndOperator()
+        query.add(EqualsOperator("catalog_environment", env))
+        query.add(EqualsOperator("facts_environment", env))
 
     status_arg = request.args.get('status', '')
     nodelist = puppetdb.nodes(
@@ -304,15 +311,14 @@ def inventory(env):
         fact_desc.append(description)
         fact_names.append(name)
 
-    if env == '*':
-        query = '["or", {0}]]'.format(
-            ', '.join('["=", "name", "{0}"]'.format(name)
-                for name in fact_names))
-    else:
-        query = '["and", ["=", "environment", "{0}"], ["or", {1}]]'.format(
-            env,
-            ', '.join('["=", "name", "{0}"]'.format(name)
-                for name in fact_names))
+    query = AndOperator()
+    fact_query = OrOperator()
+    fact_query.add([EqualsOperator("name", name) for name in fact_names])
+
+    if env != '*':
+        query.add(EqualsOperator("environment", env))
+
+    query.add(fact_query)
 
     # get all the facts from PuppetDB
     facts = puppetdb.facts(query=query)
@@ -351,12 +357,12 @@ def node(env, node_name):
     """
     envs = environments()
     check_env(env, envs)
+    query = AndOperator()
 
-    if env == '*':
-        query = '["=", "certname", "{0}"]]'.format(node_name)
-    else:
-        query='["and", ["=", "environment", "{0}"],' \
-            '["=", "certname", "{1}"]]'.format(env, node_name),
+    if env != '*':
+        query.add(EqualsOperator("environment", env))
+
+    query.add(EqualsOperator("certname", node_name))
 
     node = get_or_abort(puppetdb.node, node_name)
     facts = node.facts()
@@ -418,14 +424,14 @@ def reports(env, page):
     envs = environments()
     check_env(env, envs)
     limit = request.args.get('limit', app.config['REPORTS_COUNT'])
+    reports_query = None
+    total_query = ExtractOperator()
 
-    if env == '*':
-        reports_query = None
-        total_query = '["extract", [["function", "count"]], ["~", "certname", ""]]'
-    else:
-        reports_query = '["=", "environment", "{0}"]'.format(env)
-        total_query = '["extract", [["function", "count"]],'\
-            '["and", ["=", "environment", "{0}"]]]'.format(env)
+    total_query.add_field(FunctionOperator("count"))
+
+    if env != '*':
+        reports_query = EqualsOperator("environment", env)
+        total_query.add_query(reports_query)
 
     try:
         paging_args = {'limit': int(limit)}
@@ -499,19 +505,16 @@ def reports_node(env, node_name, page):
     """
     envs = environments()
     check_env(env, envs)
+    query = AndOperator()
+    total_query = ExtractOperator()
 
-    if env == '*':
-        query = '["=", "certname", "{0}"]'.format(node_name)
-        total_query = '["extract", [["function", "count"]],'\
-            '["=", "certname", "{0}"]'.format(node_name)
-    else:
-        query='["and",' \
-            '["=", "environment", "{0}"],' \
-            '["=", "certname", "{1}"]]'.format(env, node_name)
-        total_query = '["extract", [["function", "count"]],' \
-            '["and",' \
-            '["=", "environment", "{0}"],' \
-            '["=", "certname", "{1}"]]]'.format(env, node_name)
+    total_query.add_field(FunctionOperator("count"))
+
+    if env != '*':
+        query.add(EqualsOperator("environment", env))
+
+    query.add(EqualsOperator("certname", node_name))
+    total_query.add_query(query)
 
     reports = get_or_abort(puppetdb.reports,
         query=query,
@@ -582,15 +585,18 @@ def report(env, node_name, report_id):
     """
     envs = environments()
     check_env(env, envs)
+    query = AndOperator()
+    report_id_query = OrOperator()
+
+    report_id_query.add(EqualsOperator("hash", report_id))
+    report_id_query.add(EqualsOperator("configuration_version", report_id))
+
+    if env != '*':
+        query.add(EqualsOperator("environment", env))
+
+    query.add(EqualsOperator("certname", node_name))
+    query.add(report_id_query)
 
-    if env == '*':
-        query = '["and", ["=", "certname", "{0}"],' \
-            '["or", ["=", "hash", "{1}"], ["=", "configuration_version", "{1}"]]]'.format(
-                node_name, report_id)
-    else:
-        query = '["and", ["=", "environment", "{0}"], ["=", "certname", "{1}"],' \
-            '["or", ["=", "hash", "{2}"], ["=", "configuration_version", "{2}"]]]'.format(
-                env, node_name, report_id)
     reports = puppetdb.reports(query=query)
 
     try:
@@ -656,10 +662,12 @@ def fact(env, fact):
     render_graph = False
     if fact in graph_facts:
         render_graph = True
+
     if env == '*':
         query = None
     else:
-        query = '["=", "environment", "{0}"]'.format(env)
+        query = EqualsOperator("environment", env)
+
     localfacts = [f for f in yield_or_stop(puppetdb.facts(
         name=fact, query=query))]
     return Response(stream_with_context(stream_template(
@@ -689,7 +697,8 @@ def fact_value(env, fact, value):
     if env == '*':
         query = None
     else:
-        query = '["=", "environment", "{0}"]'.format(env)
+        query = EqualsOperator("environment", env)
+
     facts = get_or_abort(puppetdb.facts,
         name=fact,
         value=value,
@@ -803,12 +812,13 @@ def catalogs(env):
     if app.config['ENABLE_CATALOG']:
         nodenames = []
         catalog_list = []
-        if env == '*':
-            query = '["null?", "catalog_timestamp", false]]'
-        else:
-            query = '["and",' \
-                '["=", "catalog_environment", "{0}"],' \
-                '["null?", "catalog_timestamp", false]]'.format(env),
+        query = AndOperator()
+
+        if env != '*':
+            query.add(EqualsOperator("catalog_environment", env))
+
+        query.add(NullOperator("catalog_timestamp", False))
+
         nodes = get_or_abort(puppetdb.nodes,
             query=query,
             with_status=False,
@@ -942,14 +952,18 @@ def radiator(env):
             'puppetlabs.puppetdb.population:name=num-nodes')
         num_nodes = metrics['Value']
     else:
-        query = '["and", {0}]]'.format(
-            ",".join('["=", "{0}", "{1}"]'.format(field, env)
-                for field in ['catalog_environment', 'facts_environment']))
+        query = AndOperator()
+        metric_query = ExtractOperator()
+
+        query.add(EqualsOperator("catalog_environment", env))
+        query.add(EqualsOperator("facts_environment", env))
+        metric_query.add_field(FunctionOperator('count'))
+        metric_query.add_query(query)
+
         metrics = get_or_abort(
             puppetdb._query,
             'nodes',
-            query='["extract", [["function", "count"]],{0}'.format(
-                query))
+            query=metric_query)
         num_nodes = metrics[0]['count']
 
 
diff --git a/setup.py b/setup.py
index 25def84..545177a 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ setup(
         "Flask >= 0.10.1",
         "Flask-WTF >= 0.9.4, <= 0.9.5",
         "WTForms < 2.0",
-        "pypuppetdb >= 0.2.1, < 0.3.0",
+        "pypuppetdb >= 0.3.0, < 0.4.0",
         ],
     keywords="puppet puppetdb puppetboard",
     classifiers=[