Fix bug with catalog taking too long to load