Fixes to elastic event subscriber