Revert "Revert "Ensure that all extracted samples are added to view.""

This reverts commit 4b30fb86b41729e0a3c2b289534fb007abf57b33.