concurrency fixed, adding filter options