XisProvider queries refactored