-in and -ex filters

Also merge to master