Jijesh | changed sending message
Jijesh | fix display null if the unit is empty