Updated Monitor entity to filter out updates meant only for itself.
Bugfix in Monitor entity
Merge branch 'monitor'