Attempt to get the location directly from the subject if it does not have a site
Added museum and car parks