diff --git a/xmlsitemap.api.php b/xmlsitemap.api.php
index fce2419..2892ab9 100644
--- a/xmlsitemap.api.php
+++ b/xmlsitemap.api.php
@@ -192,12 +192,12 @@ function hook_xmlsitemap_context_url_options_alter(array &$options, array $conte
 function hook_query_xmlsitemap_generate_alter(QueryAlterableInterface $query) {
   $sitemap = $query->getMetaData('sitemap');
   if (!empty($sitemap->context['vocabulary'])) {
-    $node_condition = db_and();
+    $node_condition = $query->andConditionGroup();
     $node_condition->condition('type', 'taxonomy_term');
     $node_condition->condition('subtype', $sitemap->context['vocabulary']);
-    $normal_condition = db_and();
+    $normal_condition = $query->andConditionGroup();
     $normal_condition->condition('type', 'taxonomy_term', '<>');
-    $condition = db_or();
+    $condition = $query->orConditionGroup();
     $condition->condition($node_condition);
     $condition->condition($normal_condition);
     $query->condition($condition);