additional changes to filtering