Fix for server tag not exporting properly to xml