fixed quotes for variables to prevent env var name from ending up in DB:S.