fix type of emitter, refactoring date check