added additional filtering options to base model and trait