[CLC-2450] Front-end fixes