Fixed issues in binary export feature