UI-2030: fix litle bugs