Fixes #8434 - removes n+1 queries in discovered hosts index page