Cleaned up code in SelectCell* and fixed Paginator broken merge