DDF-578: Fixed security issue; small syntax issues