Fix to Query owner