Ah, I see. Thank you for the explanation. I think we need to disable to get the locations from whole dataset unless better call exist in the dbs. But I don't think we call this option anyway in current settings. I will merge the patch. As we need to ask new dbs api getting original_site_name more effiently, but I believe the issue is created already, correct?