Fix more single quotes to double quotes for interpolation