added some filtering options