improved WQL conjunction handling