Ditch where clauses
Revert "Ditch where clauses"

This reverts commit 44fc127e97d434a312b715f388806ca683f75c3b.
Remove bar from street
Remove where clause
Simplify POI worker in preparation for move
Remove with_index
Added an update puts
Set up for address