*8094* Context selector tweak