added filtering with user settings