BS-1379, change operation and expression xml format and export