Improve selection for grid