Fixed bugs relating to cell navigation and selection without cell navigation