diff --git a/CHANGES.txt b/CHANGES.txt
index 69db765..7050129 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,16 @@
 Changelog
 =========
 
+1.0b3 (unreleased)
+------------------
+
+- Fixed context for getting ajax results
+  [kroman0]
+
+- Fixed conditional initialization of querywidget,
+  see https://dev.plone.org/ticket/12529 [kroman0]
+
+
 1.0b2 (2012-03-19)
 ------------------
 
diff --git a/plone/formwidget/querystring/querywidget.js b/plone/formwidget/querystring/querywidget.js
index ef839cb..fbddfa5 100644
--- a/plone/formwidget/querystring/querywidget.js
+++ b/plone/formwidget/querystring/querywidget.js
@@ -171,7 +171,17 @@
     };
 
     $.querywidget.updateSearch = function () {
-        var query = portal_url + "/@@querybuilder_html_results?";
+        var context_url = (function() {
+            var baseUrl, pieces;
+            baseUrl = $('base').attr('href');
+            if (!baseUrl) {
+                pieces = window.location.href.split('/');
+                pieces.pop();
+                baseUrl = pieces.join('/');
+            }
+            return baseUrl;
+        })();
+        var query = context_url + "/@@querybuilder_html_results?";
         var querylist  = [];
         var items = $('.QueryWidget .queryindex');
         if (!items.length) {
@@ -201,7 +211,7 @@
                     break;
             }
 
-            $.get(portal_url + '/@@querybuildernumberofresults?' + querylist.join('&'),
+            $.get(context_url + '/@@querybuildernumberofresults?' + querylist.join('&'),
                   {},
                   function (data) { results.html(data); });
         });
@@ -216,6 +226,11 @@
     // Enhance for javascript browsers
     $(document).ready(function () {
 
+        // Check if QueryWidget exists on page
+        if ($(".QueryWidget").length === 0) {
+            return false;
+        }
+
         // Init
         $.querywidget.init();
 
diff --git a/setup.py b/setup.py
index 319d457..497d8d7 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '1.0b2'
+version = '1.0b3'
 
 setup(name='plone.formwidget.querystring',
       version=version,