Fix account filter