activeFlag comparator from undefined to null as per /canvas/DBEvent.java line 16
small readability improvements and refactoring
removed broken code