Fix more broken (excluding an empty list will return things)