Fixes empty graphs and new store event handlers