Closes #1393
Relates to #1393
Avoids possible permission issues where included content shown in search or preview where the user would not normally have permission to view the included content. Closes #1178