KAZOOUI-212: Fixed the UI with the back-end change.