Issue 5345 fixes on new host ui