refactoring + filter disabled during loading
fix in event loader