LPS-44761  Site editors can't filter web content by structure

The pull request extends from https://github.com/hhuijser/liferay-portal/pull/1967.

Please refer to the detailed explanation from https://github.com/hhuijser/liferay-portal/pull/1967

Thanks,
Hai