More edits to encryption data. Fix for order create and upate