Fixed loading for DB calls