[DF-1155] Fixes for landscape editor