#386 Fixed updating changed entityid
#386 Fixed storing message