handling default-site in 2.4 as per #188