Refine NewDiameter ifelse.
Add site code key.