event lookupper, builder, criterias and other fixes
Merge remote-tracking branch 'origin/master'