Refactor filter associated units