Merge pull request #7448 from RolandMunsil/improve-cheat-search Improve performance of cheat searching & add input validation
