add quotes and fix DHH