Added additional checks for viewing contact and site data