diff --git a/generators/wiki/cpu_parameters.rb b/generators/wiki/cpu_parameters.rb
index f141066420c7a0d644093aee59947ed349e83d9b..17ec5ea203bc5a06fe68ff856518af88dde42516 100644
--- a/generators/wiki/cpu_parameters.rb
+++ b/generators/wiki/cpu_parameters.rb
@@ -48,11 +48,11 @@ class CPUParametersGenerator < WikiGenerator
     }
     #Sort by cluster date
     table_data.sort_by! { |row|
-      DateTime.parse(row[0])
+      [DateTime.parse(row[0]), row[1], row[2]]
     }
 
     #Table construction
-    table_options = 'class="G5KDataTable" border="1" style="text-align: center;"'
+    table_options = 'class="wikitable sortable"'
     @generated_content = MW.generate_table(table_options, table_columns, table_data)
     @generated_content += MW.italic(MW.small("Generated from the Grid5000 APIs on " + Time.now.strftime("%Y-%m-%d")))
     @generated_content += MW::LINE_FEED
@@ -63,5 +63,5 @@ generator = CPUParametersGenerator.new("Generated/CPUParameters")
 
 options = WikiGenerator::parse_options
 if (options)
-  WikiGenerator::exec(generator, options)
+  exit(WikiGenerator::exec(generator, options))
 end