* Fix events being created for system objects * move the condition above to avoid unnecessary db calls