Index All page loading fix - take 2