Reverts previous commit and introduces better way to filter ships