Fixed the expand & show NPEs