refactor & fix field selection for event notification