Temp fix for load times before adding pagination