SOAP-639 Fixed metadata editor issue