Improve the quick export