Fix ProgressBar not showing up on hero search and general refactoring