this should be 'drop and filter' + deprecation of filter should be added