Fix xowner query