Avoid filtering with empty value