fix import order and blank fields