Getting rid of separate filtering workflow