Revised modelSelect with two expand grids