VE-821 Fix disappearing loading indicator
VE-768 Changes from code review