added enhancedSecurity switch
2131 - subjected View/Correct to enhancedSecurity