Move event parameter to third position - makes more sense.
Add test for non batch selection with event.