AUI-1043 Using more comprehensive selector on conditional