Fixes the case where moving between views exposes some brokenness. Fixes GB#639547 - Duplicated result