Bugfix and enhancements for csv and nagios file imports