Added filtering enhancements/tweaks