improvements for switching between grid option types