XisService/Method queries fixed