Added check on searches to prevent crashing
Merge branch 'master' of https://github.com/SaveThatDish/STDv2/