fix #91

revert modification of commit 53f7d61027d88807e4b55729ad80dd163518c55c
fix also : NIN criteria with no parameters