Import upgrade, and different bux fixies
Import executed after several AJAX request due to exceede max_execution_time with single request