Fixes for cluster repository editor and acc. to ticket #721