Change to use ES filters.