Remove blank values and repair association event type issue