LPS-43353 Hiding nodes without data
LPS-43353 Avoiding unnecessary remote call
LPS-43353 Source formatting