CLC-4021: fixes for failing Selenium tests
CLC-4021: fixes for failing Selenium tests