- Moved the empty argument filter so it's executed on every run, not only the first one.