KRACOEUS-8061 more loading indicator fixes