Fix OR check implicit grouping screwing us (was evaluating the OR and discregarding the null check) - causing the viewmodel to double deploy