ZEN-15370: Gateway type property is not Entity
ZEN-15369: Fixed TypeError when remodeling instances during monitoring