unrefactored commit, solves problem with reordering
fixed problems with multiselect and singleselect grid reordering