Fixed to use location rather than sitename