FLUID-5542: removed quotes around some keys