LPS-51490 Organization sites without layouts aren't returned
LPS-51490 Regen
LPS-51490 SF