Refactor filter view for admin