[CLC-1927] Front-end fixes