Fixes: #2595 Clean objectSelect and fixed tabs_ogroup
Fixes: #2622 Select classes should be cleaned and regrouped