Issue #2390585 Fixing issues with extra layers in the build array, and of ignoring view_mode information