fix waterfall data load order adn no data