WSOTWO-94: fixed bugs related to editor displaying