Fix remaining where/values issues