Feature/improve export results