Updated all fitlers to use criteria