PIM-3326-stable : Fix EntityFilterSpec