VID-1464 using const instead of string