added endpointid to topic in eventhandler