VID-1723 Use constant variable for selector