Refactor filter loading