Changed iterator used during import, so it can replace fid and feature type

That functionality had been mistakenly left aside after changes made to improve performance