PIM-3326-stable : Fix mongo filter with empty and values
PIM-3326-stable : Fix mistakes in config