Fix bug global criteria factory and manager