Fix extended cell selection + pagination