Merge branch 'robbert/set_map_filter' into 'master'

Make filter lemmas for maps and sets consistent + add cross split property for maps

See merge request !274