Bugfixed Broker services handling