Fixed street type `None` bug