Revert "re #772 - Query directly to the streets table"

This reverts commit 5f412964386951dcef6fb27ea01d4d62925d6beb.
re #772 - Fixed typo
re #772 - Minor code refactor
re #772 - 'islp' column is not always an integer