[DF-2946] small fixes in logic, ui