fixed default selected cell
Another tweek