updated filtering to make it simpler for users and more efficient during processing