Re add filtering to try to get workflow working