Refactoring, fix nullpointerexception (commit: 2339928)
Try to fix : filteredlist issue and singularconstraint issue (commit: 75ed50a)
Refactoring + fix pb (commit: 7785ce2)