BZ-13105 fixed query util
Merge remote-tracking branch 'origin/competitive-estimates' into RC20140807

* origin/competitive-estimates:
  BZ-13105 fixed query util