Improve return eligibility rules