Fixed publish/subscribe and reloads