Adding in checks to make sure streets come before cities