VID-1622 Single-fy those quotes