Added additional filtering options.