Blocspot database visited POI fix and code clean-up