Use a set instead of map object to restore intended behaviour of filter and intersection. Will-fix: #15822