Fix empty value filtering