Bug fixed - building query tree..