Bug fixed: Sort by combo from toolbar didn't use the correct form