Fix the order of custom fields