Tweaked dc-query