Change column order to conform with standard #2289

Standard order is now officially FilterSet, Part and then Filter.
Columns in table should respect this order for easier comparaison
with country files
Reformat code via NetBeans