Fix for default group
Minor fixes for column reorder