Hotfix for issue #48
Reverts previous commit and introduces better way to filter ships
Merge pull request #49 from blitzmann/searchfix

Fixed issue #48