Solve issues #1 and #3 for NGSI Event Broker