Exchange Reporter Plus Fixes and Enhancements