Improvement: Filter options for orders