update setting key name
move rotuing to new file
clean up privilege check. Provide *AuthContext.ValidCurrentUser