Merge pull request #44 from shentok/cleanup

Various fixes
allow searching for addresses and sights, too