fixed ToQuery instances