EUCA-6481
ensured zone was moved from ui model to data model