XisDialog queries refactor