Code cleanup
Fixed crash when searching without internet connection
Merge pull request #2 from NaviDeck-fdim/Challenge-accepted

Code cleanup